diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.3_pre2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.3_pre2
deleted file mode 100644
index 76d634040e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.3_pre2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-libs/libdrm-2.4.6 >=x11-libs/libpciaccess-0.10 x11-libs/cairo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=intel gpu userland tools
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=x11-libs/libdrm-2.4.6 >=x11-libs/libpciaccess-0.10 x11-libs/cairo !<=x11-base/xorg-x11-6.9
-RESTRICT=test
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.0.3_pre2.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
-_md5_=44bf81d69ae01fb36afc31911c34870b
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mesa-progs-7.5.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mesa-progs-7.5.1-r1
deleted file mode 100644
index 42af699d8c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mesa-progs-7.5.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=virtual/glut virtual/opengl virtual/glu
-DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo)
-HOMEPAGE=http://mesa3d.sourceforge.net/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
-LICENSE=LGPL-2
-RDEPEND=virtual/glut virtual/opengl virtual/glu
-SLOT=0
-SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/7.5.1/MesaLib-7.5.1.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/7.5.1/MesaDemos-7.5.1.tar.bz2
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=d1c64255283116c9e9fddc28b1c62f7c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-0.0.1-r22 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-0.0.1-r22
deleted file mode 100644
index d4d1a8a1d7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-0.0.1-r22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=info prepare setup unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
-DESCRIPTION=Multitouch Contact Plotter
-EAPI=4
-HOMEPAGE=http://src.chromium.org
-IUSE=cros_workon_tree_ccfcb72fba4959143cc6e3273301e2be6965ff53
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11
-SLOT=0
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=8be5e1bcd3160cca6ac479709c8e3852
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-9999
deleted file mode 100644
index fa7fc87b30..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=info prepare setup unpack
-DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
-DESCRIPTION=Multitouch Contact Plotter
-EAPI=4
-HOMEPAGE=http://src.chromium.org
-IUSE=cros_workon_tree_
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11
-SLOT=0
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=f6e2bf580dd4e8030f300bee7fb2a303
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xinit-1.3.0-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xinit-1.3.0-r2
deleted file mode 100644
index bed91c0a98..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xinit-1.3.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=X Window System initializer
-EAPI=3
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=+minimal
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
-LICENSE=MIT GPL-2
-PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
-RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.0.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=eac70a42b0e19f597b938daeaed4f996
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xset-mini-1.2.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xset-mini-1.2.2
deleted file mode 100644
index 3987623c35..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xset-mini-1.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11
-DESCRIPTION=X.Org xset application stripped down for just 'r' and 'm' commands
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=+minimal
-KEYWORDS=alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libXmu x11-libs/libX11
-SLOT=0
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912
-_md5_=b04332feeb0d0993c0ffa5e38b4ddae0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xtrace-1.0.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xtrace-1.0.2
deleted file mode 100644
index 5527f45f21..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xtrace-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11
-DESCRIPTION=X11 proxy that logs communication between a client and a server
-EAPI=2
-HOMEPAGE=http://xtrace.alioth.debian.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=http://alioth.debian.org/frs/download.php/3201/_1.0.2.orig.tar.gz
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=76357eacf71887eaa6ddfc9b47099733
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-base/xorg-drivers-1.12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-base/xorg-drivers-1.12
deleted file mode 100644
index 249b61d4c4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/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=http://www.gentoo.org/
-IUSE=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_neomagic video_cards_newport video_cards_nouveau video_cards_nv video_cards_omapfb video_cards_qxl video_cards_r128 video_cards_radeon video_cards_s3 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_v4l 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_cmt 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 ~x86-fbsd
-LICENSE=as-is
-PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_cmt? ( x11-drivers/xf86-input-cmt ) 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_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_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_omapfb? ( x11-drivers/xf86-video-omapfb ) 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_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_v4l? ( x11-drivers/xf86-video-v4l ) 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-1.2.3 !<=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-s3virge-1.10.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_=2eddde1a6dcbb1481b4f8ec02ae4a5c8
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-base/xorg-server-1.12.4-r10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-base/xorg-server-1.12.4-r10
deleted file mode 100644
index 9ac24b9653..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-base/xorg-server-1.12.4-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=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/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-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/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/glproto-1.4.14 >=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 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 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=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=dmx kdrive xnest xorg xvfb broken_partialswaps -doc ipv6 minimal nptl selinux +suid tegra tslib +udev static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.12 )
-RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=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/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-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.4.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	versionator	865bc8b2fc9fcfb6d520bdf5a110f5ed	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=cc1937987d75e7653bcd0e616dbc8461
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1
deleted file mode 100644
index d7c55cc65e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Rules for setting permissions right on /dev/mali0
-EAPI=4
-KEYWORDS=arm
-LICENSE=BSD
-SLOT=0
-_md5_=992e7bee8e0705fcf9bd18cdaaec1d0c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0
deleted file mode 100644
index d7c55cc65e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Rules for setting permissions right on /dev/mali0
-EAPI=4
-KEYWORDS=arm
-LICENSE=BSD
-SLOT=0
-_md5_=992e7bee8e0705fcf9bd18cdaaec1d0c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36
deleted file mode 100644
index b393638a07..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=<x11-base/xorg-server-1.9.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 !<media-video/nvidia-settings-256.52 kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils
-DESCRIPTION=NVIDIA X11 driver and GLX libraries
-EAPI=2
-HOMEPAGE=http://www.nvidia.com/
-IUSE=acpi custom-cflags gtk multilib kernel_linux kernel_linux
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=NVIDIA
-PDEPEND=>=x11-libs/libvdpau-0.3-r1 gtk? ( media-video/nvidia-settings )
-RDEPEND=<x11-base/xorg-server-1.9.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 !<media-video/nvidia-settings-256.52 x11-libs/libXvMC kernel_linux? ( virtual/modutils ) acpi? ( sys-power/acpid ) kernel_linux? ( virtual/modutils )
-RESTRICT=strip
-SLOT=0
-SRC_URI=x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/260.19.36/NVIDIA-Linux-x86-260.19.36.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/260.19.36/NVIDIA-Linux-x86_64-260.19.36.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/260.19.36/NVIDIA-FreeBSD-x86-260.19.36.tar.gz )
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	linux-info	01b7a221ed254c010703fd454e011ea6	linux-mod	07a3d250a1268d811d3e8730e5741394	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nvidia-driver	f195f64263551aa3c4a9aff69ed97059	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	versionator	865bc8b2fc9fcfb6d520bdf5a110f5ed
-_md5_=eb8b68ad54621db9e4c589760db8ff53
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-0.0.1-r14 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-0.0.1-r14
deleted file mode 100644
index 2d81eab405..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-0.0.1-r14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=x11-libs/libX11 x11-drivers/opengles-headers dev-vcs/git
-DESCRIPTION=OpenGL|ES mock library
-EAPI=4
-HOMEPAGE=http://www.khronos.org/opengles/2_X/
-IUSE=cros_workon_tree_1a5966915f51a670b1f1bd4fda10ec670b40244b
-KEYWORDS=arm x86
-LICENSE=SGI-B-2.0
-RDEPEND=x11-libs/libX11 x11-drivers/opengles-headers
-SLOT=0
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=72c7bf2505c79a2fbc32f5a62e9703d6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-9999
deleted file mode 100644
index c917197e15..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=x11-libs/libX11 x11-drivers/opengles-headers dev-vcs/git
-DESCRIPTION=OpenGL|ES mock library
-EAPI=4
-HOMEPAGE=http://www.khronos.org/opengles/2_X/
-IUSE=cros_workon_tree_
-KEYWORDS=~arm ~x86
-LICENSE=SGI-B-2.0
-RDEPEND=x11-libs/libX11 x11-drivers/opengles-headers
-SLOT=0
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=02b7e831a4820d044457bfb81d793c38
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-headers-0.0.1-r13 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-headers-0.0.1-r13
deleted file mode 100644
index 36b6f9a863..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-headers-0.0.1-r13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=info install setup unpack
-DEPEND=dev-vcs/git
-DESCRIPTION=OpenGL|ES headers.
-EAPI=2
-HOMEPAGE=http://www.khronos.org/opengles/2_X/
-IUSE=cros_workon_tree_1a5966915f51a670b1f1bd4fda10ec670b40244b
-KEYWORDS=x86 arm
-LICENSE=SGI-B-2.0
-SLOT=0
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=e898726ef860a0c3b55b099ffafffadd
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-headers-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-headers-9999
deleted file mode 100644
index 8cbc31ee6c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-headers-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=info install setup unpack
-DEPEND=dev-vcs/git
-DESCRIPTION=OpenGL|ES headers.
-EAPI=2
-HOMEPAGE=http://www.khronos.org/opengles/2_X/
-IUSE=cros_workon_tree_
-KEYWORDS=~x86 ~arm
-LICENSE=SGI-B-2.0
-SLOT=0
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=688d878f6579919131fa744d9c5fd3cb
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-0.0.1-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-0.0.1-r9
deleted file mode 100644
index 2e0b19f9d0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-0.0.1-r9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure info install prepare setup test unpack
-DEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
-DESCRIPTION=Chromium OS multitouch driver regression tests.
-EAPI=4
-IUSE=cros_workon_tree_7d097ae9d618817e2c9a274a07c3ec207a631583
-KEYWORDS=arm amd64 x86
-LICENSE=BSD
-RDEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto
-SLOT=0
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=8a5ea11aa36a73c4e56db6ab6f8ef1ac
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999
deleted file mode 100644
index 5e5eafb18d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure info install prepare setup test unpack
-DEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
-DESCRIPTION=Chromium OS multitouch driver regression tests.
-EAPI=4
-IUSE=cros_workon_tree_
-KEYWORDS=~arm amd64 ~x86
-LICENSE=BSD
-RDEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto
-SLOT=0
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=3c61498470d6bd908bb97cf565c66646
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101
deleted file mode 100644
index 35f8c15ac9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure info install prepare setup test unpack
-DEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
-DESCRIPTION=Chromium OS multitouch input driver for Xorg X server.
-EAPI=4
-IUSE=cros_workon_tree_3b26ecfe0fc8246a9771a6b1539572d0d70e3ad1
-KEYWORDS=arm amd64 x86
-LICENSE=BSD
-RDEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server
-SLOT=0
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=cf420d228f97cd5a8b4ee387258f2506
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999
deleted file mode 100644
index e21f0078bc..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure info install prepare setup test unpack
-DEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
-DESCRIPTION=Chromium OS multitouch input driver for Xorg X server.
-EAPI=4
-IUSE=cros_workon_tree_
-KEYWORDS=~arm ~amd64 ~x86
-LICENSE=BSD
-RDEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server
-SLOT=0
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=d96ebc46f1e988ac78f9b3120ae18bc5
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3
deleted file mode 100644
index 033c11a317..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
-DESCRIPTION=Generic Linux input driver
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server[xorg]
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=9d45ae64d4a90840058743a4ab653c51
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13
deleted file mode 100644
index 033c11a317..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
-DESCRIPTION=Generic Linux input driver
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server[xorg]
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=9d45ae64d4a90840058743a4ab653c51
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91
deleted file mode 100644
index db0e1f8336..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure info install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess dev-vcs/git
-DESCRIPTION=X.Org driver for ARM devices
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=cros_workon_tree_0d2d6cd5e23e84585ebe72df251360086c8408bf
-KEYWORDS=-* arm
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-armsoc-0.0.1.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=76626a63ead6a130a7b910ce5e45c597
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999
deleted file mode 100644
index 031ac9cdbc..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure info install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess dev-vcs/git
-DESCRIPTION=X.Org driver for ARM devices
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=cros_workon_tree_
-KEYWORDS=-* ~arm
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	cros-workon	5f2f8a42fa8e9e59f25015d9167f93a4	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=944ebfd311dc1090a8066b5328a5fcf8
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9
deleted file mode 100644
index 968b108f5c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXext x11-libs/libXfixes xvmc? ( x11-libs/libXvMC ) >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.23[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 ) >=x11-proto/dri2proto-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for Intel cards
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=dri sna xvmc broken_partialswaps dri
-KEYWORDS=amd64 ~ia64 x86 -x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libXext x11-libs/libXfixes xvmc? ( x11-libs/libXvMC ) >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.23[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.16.0.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	linux-info	01b7a221ed254c010703fd454e011ea6	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	versionator	865bc8b2fc9fcfb6d520bdf5a110f5ed	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=84828c443d7f2f2603fb2ab324282add
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1
deleted file mode 100644
index c4cf1388f5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=Generic VESA video driver
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=debug
-KEYWORDS=-* ~alpha amd64 ~ia64 x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
-_md5_=9ae88dd31766afb3218be4e38413dea4
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/cairo-1.10.2-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/cairo-1.10.2-r2
deleted file mode 100644
index 770c106e4d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/cairo-1.10.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) dev-util/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.1 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A vector graphics library with cross-device output support
-EAPI=3
-HOMEPAGE=http://cairographics.org/
-IUSE=X aqua debug directfb doc drm gallium opengl openvg qt4 static-libs +svg xcb cairo-perf-trace
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
-RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://cairographics.org/releases/cairo-1.10.2.tar.gz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=b5614dee88eda90b8c43e94b9c072d55
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/gtk+-2.20.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/gtk+-2.20.1
deleted file mode 100644
index da4e613211..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/gtk+-2.20.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.2 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.21.3 >=x11-libs/pango-1.20 >=dev-libs/atk-1.13 media-libs/fontconfig x11-misc/shared-mime-info >=media-libs/libpng-1.2.1 cups? ( net-print/cups ) jpeg? ( >=media-libs/jpeg-6b-r2:0 ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.5.7 ) !<gnome-base/gail-1000 >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) x86-interix? ( sys-libs/itx-bind ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=2
-HOMEPAGE=http://www.gtk.org/
-IUSE=aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2
-PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.2 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.21.3 >=x11-libs/pango-1.20 >=dev-libs/atk-1.13 media-libs/fontconfig x11-misc/shared-mime-info >=media-libs/libpng-1.2.1 cups? ( net-print/cups ) jpeg? ( >=media-libs/jpeg-6b-r2:0 ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.5.7 ) !<gnome-base/gail-1000
-SLOT=2
-SRC_URI=mirror://gnome/sources/gtk+/2.20/gtk+-2.20.1.tar.bz2
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	versionator	865bc8b2fc9fcfb6d520bdf5a110f5ed	virtualx	e9162f65645513120b4e12863a5fa972
-_md5_=e0d42fb0f56b4edbbdcf8c033ea9b026
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXfont-1.4.4-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXfont-1.4.4-r1
deleted file mode 100644
index 22e16f61cc..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXfont-1.4.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 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 Xfont library
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=ipv6 static-libs doc
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.4.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=db339124932f4f4e0a848e0069d4a361
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXft-2.2.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXft-2.2.0-r1
deleted file mode 100644
index 86ccfde89c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXft-2.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=X.Org Xft library
-EAPI=3
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.2.0.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=367c6899b512349ba82ae0af0eeee0ba
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXi-1.6.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXi-1.6.0-r1
deleted file mode 100644
index 4dbe1c76b4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXi-1.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 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 Xi library
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=static-libs doc
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.0.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=023590ebd190057dd23a605b6f34afa3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXt-1.0.6-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXt-1.0.6-r1
deleted file mode 100644
index 5e793044d2..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXt-1.0.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto >=x11-misc/util-macros-1.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=X.Org Xt library
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=debug
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.6.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
-_md5_=a2d9a6d549fb2b552bc5a0318b2384b6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39
deleted file mode 100644
index 4a272921b0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=X.Org libdrm library
-EAPI=4
-HOMEPAGE=http://dri.freedesktop.org/
-IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.39.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=643307b815fed12113f6105c3491df70
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39-r5
deleted file mode 100644
index 4a272921b0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=X.Org libdrm library
-EAPI=4
-HOMEPAGE=http://dri.freedesktop.org/
-IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.39.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=643307b815fed12113f6105c3491df70
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39
deleted file mode 100644
index 9cc444cb26..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=X.Org libdrm library
-EAPI=4
-HOMEPAGE=http://dri.freedesktop.org/
-IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39
-RESTRICT=test
-SLOT=0
-SRC_URI=http://dri.freedesktop.org/libdrm-tests/libdrm-2.4.39.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=a39302dc6251f406fdf336d67ef7a85e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39-r2
deleted file mode 100644
index 9cc444cb26..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=X.Org libdrm library
-EAPI=4
-HOMEPAGE=http://dri.freedesktop.org/
-IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39
-RESTRICT=test
-SLOT=0
-SRC_URI=http://dri.freedesktop.org/libdrm-tests/libdrm-2.4.39.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=a39302dc6251f406fdf336d67ef7a85e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libpciaccess-0.12.902-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libpciaccess-0.12.902-r1
deleted file mode 100644
index fbcb0a0af5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libpciaccess-0.12.902-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=Library providing generic access to the PCI bus and devices
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=minimal zlib static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.12.902.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=0dfac7dd99c75dbb44b4dbced0083aaf
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.19_pre2-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.19_pre2-r3
deleted file mode 100644
index 7a5dae26fa..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.19_pre2-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/libva-1.1.0_rc1 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=HW video decode support for Intel integrated graphics
-EAPI=3
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.1.0_rc1 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel]
-SLOT=0
-SRC_URI=http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-1.0.19_pre2.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=6f9fe16aace2cab1e655386667acbd39
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxcb-1.8.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxcb-1.8.1
deleted file mode 100644
index 8eb4c88a81..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxcb-1.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs doc? ( app-doc/doxygen ) dev-libs/libxslt >=x11-proto/xcb-proto-1.7.1 >=dev-lang/python-2.5[xml] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=X C-language Bindings library
-EAPI=3
-HOMEPAGE=http://xcb.freedesktop.org/
-IUSE=doc selinux static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs
-SLOT=0
-SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.1.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=c6e17d064c8ad5852ef61735d1de6053
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxkbcommon-0.0.0_alpha1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxkbcommon-0.0.0_alpha1
deleted file mode 100644
index 547bdee089..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxkbcommon-0.0.0_alpha1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5 sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 dev-vcs/git
-DESCRIPTION=X.Org xkbcommon library
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=static-libs
-KEYWORDS=amd64 arm x86
-LICENSE=MIT
-RDEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5
-SLOT=0
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	git-2	da60d6e85fa94cef4d510cab24e01e36	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=8003ff2c6465aa25e15a598521c3e84e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4
deleted file mode 100644
index 416d10760c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
-DESCRIPTION=Internationalized text layout and rendering library
-EAPI=3
-HOMEPAGE=http://www.pango.org/
-IUSE=X doc introspection test debug
-KEYWORDS=amd64 arm x86
-LICENSE=LGPL-2 FTL
-RDEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft )
-SLOT=0
-SRC_URI=mirror://gnome/sources/pango/1.28/pango-1.28.4.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	fdo-mime	9c46e30acd923ff12e325dbe96bb98b9	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	e766f648c9d51ea0afabaf25bddb1ad9	gnome2-utils	0067e2e4dc66e2ff223a9c527e329407	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	versionator	865bc8b2fc9fcfb6d520bdf5a110f5ed
-_md5_=e910bba8f04a9558bd3a2d94ea1297c0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4-r3
deleted file mode 100644
index 416d10760c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
-DESCRIPTION=Internationalized text layout and rendering library
-EAPI=3
-HOMEPAGE=http://www.pango.org/
-IUSE=X doc introspection test debug
-KEYWORDS=amd64 arm x86
-LICENSE=LGPL-2 FTL
-RDEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft )
-SLOT=0
-SRC_URI=mirror://gnome/sources/pango/1.28/pango-1.28.4.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	fdo-mime	9c46e30acd923ff12e325dbe96bb98b9	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	e766f648c9d51ea0afabaf25bddb1ad9	gnome2-utils	0067e2e4dc66e2ff223a9c527e329407	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	versionator	865bc8b2fc9fcfb6d520bdf5a110f5ed
-_md5_=e910bba8f04a9558bd3a2d94ea1297c0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/unclutter-8-r7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/unclutter-8-r7
deleted file mode 100644
index b3d905c232..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/unclutter-8-r7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-proto/xproto
-DESCRIPTION=Hides mouse pointer while not in use.
-HOMEPAGE=http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86
-LICENSE=public-domain
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi
-SLOT=0
-SRC_URI=ftp://ftp.x.org/contrib/utilities/unclutter-8.tar.Z
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=a355a91ecb5832e54d9264a820696f03
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r15 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r15
deleted file mode 100644
index d862d40473..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2 x11-proto/xproto >=dev-util/intltool-0.30 dev-perl/XML-Parser || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=X keyboard configuration database
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/XKeyboardConfig
-IUSE=parrot
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config-2.4.1.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=f842bf5aa0be0ffead4745fb313a5ba6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xcb-proto-1.7.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
deleted file mode 100644
index 6b4e18b2c9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libxml2 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=X C-language Bindings protocol headers
-EAPI=3
-HOMEPAGE=http://xcb.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.1.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	python	6bbd984910e27780e5d0ea543d83ef84	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=d014d8c7e782e2eb0eb136851b7425a1
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xextproto-7.2.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xextproto-7.2.0
deleted file mode 100644
index 5464f418a1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xextproto-7.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!<x11-libs/libXext-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 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 XExt protocol headers
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=doc
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=!<x11-libs/libXext-1.0.99
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.0.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=3e782d06a1d651f7c856662bcaac1fc3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.07-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.07-r1
deleted file mode 100644
index f0deb105fd..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.07-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=rxvt clone with xft and unicode support
-EAPI=2
-HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
-IUSE=minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3
-SLOT=0
-SRC_URI=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.07.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=a99a8294e901c6dd487d4c21e409f87d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.10
deleted file mode 100644
index 366ca4a801..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=rxvt clone with xft and unicode support
-EAPI=2
-HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
-IUSE=minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3
-SLOT=0
-SRC_URI=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.10.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=a99a8294e901c6dd487d4c21e409f87d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/xterm-255 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/xterm-255
deleted file mode 100644
index cabb5a8d8a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/xterm-255
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXft x11-libs/libXaw x11-apps/xmessage unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/Xaw3d ) x11-proto/xproto
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=2
-HOMEPAGE=http://dickey.his.com/xterm/
-IUSE=-toolbar +truetype +unicode -Xaw3d
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXft x11-libs/libXaw x11-apps/xmessage unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/Xaw3d )
-SLOT=0
-SRC_URI=ftp://invisible-island.net/xterm/xterm-255.tgz
-_eclasses_=binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	64fc271a237429f84f36b91c9f4b9912
-_md5_=0e8c765a4b6d83bf496a1cb03122fff8
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/Manifest
deleted file mode 100644
index d824c4f5bd..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST intel-gpu-tools-1.0.3_pre2.tar.bz2 808375 SHA256 a647fe7b777d5a084f4be9995fc2984239af115fb5a9f19d850880e243118e4a SHA512 da9aede40a378223f9e6a5fa14818a9684da3b1a8a597291b6e2e45b0f088f1aabdf64dc5c5c6a341da5770baadd17d1131197ef78f73e32a1cecc4c1de9dc02 WHIRLPOOL 643b8e02b5e7bed2fcb469aec36e82a0ac8740efd5ca0ef12d104ef5155c7c31d12483f5b4977e0f79e76cf720442ce626055f03d8ab8ea283a2c60e6f15dcac
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.3_pre2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.3_pre2.ebuild
deleted file mode 100644
index 876e3461f3..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.3_pre2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.2.ebuild,v 1.3 2009/12/10 18:16:44 fauli Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="intel gpu userland tools"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="
-	>=x11-libs/libdrm-2.4.6
-	>=x11-libs/libpciaccess-0.10
-	x11-libs/cairo"
-RDEPEND="${DEPEND}"
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/Manifest
deleted file mode 100644
index d933de577a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST MesaDemos-7.5.1.tar.bz2 1552059 RMD160 9147d9fba75998fcd344a736995069ec642c8893 SHA1 5bafef98a896f4e5c22d17b435db0d14e981ba6c SHA256 64d6b9b42a93e93b770cd07d944a5fe872752db18b1cd84224198f7a431a1721
-DIST MesaLib-7.5.1.tar.bz2 4382803 RMD160 bccf6f52fce3b3c7ac6525444f907e3c2fe790c2 SHA1 26171fb4de23a21431861d6663203e400df45bf7 SHA256 48f21e5a91a82fa9fb6d0bc5ae72d9d9cc1824429dcfc759cfcc1a44e3e1440a
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/files/mesa-progs-7.5.1-gold.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/files/mesa-progs-7.5.1-gold.patch
deleted file mode 100644
index 2dde569898..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/files/mesa-progs-7.5.1-gold.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru Mesa-7.5.1/progs/xdemos/Makefile Mesa-7.5.1.patched/progs/xdemos/Makefile
---- Mesa-7.5.1/progs/xdemos/Makefile	2010-10-06 10:21:04.000000000 -0700
-+++ Mesa-7.5.1.patched/progs/xdemos/Makefile	2010-10-06 10:20:31.000000000 -0700
-@@ -8,7 +8,7 @@
- 
- LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
- 
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) -lX11 -lpthread
- 
- PROGS = \
- 	corender \
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/mesa-progs-7.5.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/mesa-progs-7.5.1-r1.ebuild
deleted file mode 100644
index 3a2a8c4083..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/mesa-progs-7.5.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild,v 1.8 2009/12/16 18:02:52 scarabeus Exp $
-
-inherit eutils toolchain-funcs
-
-MY_PN="${PN/m/M}"
-MY_PN="${MY_PN/-progs}"
-MY_P="${MY_PN}-${PV/_/-}"
-LIB_P="${MY_PN}Lib-${PV/_/-}"
-PROG_P="${MY_PN}Demos-${PV/_/-}"
-DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-if [[ $PV = *_rc* ]]; then
-	SRC_URI="http://www.mesa3d.org/beta/${LIB_P}.tar.gz
-		http://www.mesa3d.org/beta/${PROG_P}.tar.gz"
-elif [[ $PV = 9999 ]]; then
-	SRC_URI=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${PV}/${LIB_P}.tar.bz2
-		ftp://ftp.freedesktop.org/pub/mesa/${PV}/${PROG_P}.tar.bz2"
-fi
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="virtual/glut
-	virtual/opengl
-	virtual/glu"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if [[ ${KERNEL} == "FreeBSD" ]]; then
-		CONFIG="freebsd"
-	elif use x86; then
-		CONFIG="linux-dri-x86"
-	elif use amd64; then
-		CONFIG="linux-dri-x86-64"
-	elif use ppc; then
-		CONFIG="linux-dri-ppc"
-	else
-		CONFIG="linux-dri"
-	fi
-}
-
-src_unpack() {
-	HOSTCONF="${S}/configs/${CONFIG}"
-
-	unpack ${A}
-	cd "${S}"
-
-	# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
-	# build.
-	echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
-
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
-	echo "LDFLAGS = ${LDFLAGS}" >> ${HOSTCONF}
-
-	# Just executables here, no need to compile with -fPIC
-	echo "PIC_FLAGS =" >> ${HOSTCONF}
-
-	epatch "${FILESDIR}"/${P}-gold.patch
-}
-
-src_compile() {
-	cd "${S}"/configs
-	ln -s ${CONFIG} current
-
-	cd "${S}"/progs/xdemos
-
-	emake glxinfo || die "glxinfo failed"
-	emake glxgears || die "glxgears failed"
-}
-
-src_install() {
-	dobin "${S}"/progs/xdemos/{glxgears,glxinfo} || die
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-0.0.1-r22.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-0.0.1-r22.ebuild
deleted file mode 100644
index 74cd16c10a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-0.0.1-r22.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CROS_WORKON_COMMIT="f0fda739ab48538a97ed784c9cd1f94dc2569555"
-CROS_WORKON_TREE="ccfcb72fba4959143cc6e3273301e2be6965ff53"
-CROS_WORKON_PROJECT="chromiumos/platform/mtplot"
-inherit autotools cros-workon
-
-DESCRIPTION="Multitouch Contact Plotter"
-CROS_WORKON_LOCALNAME="../platform/mtplot"
-HOMEPAGE="http://src.chromium.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-9999.ebuild
deleted file mode 100644
index c4d7a06afd..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CROS_WORKON_PROJECT="chromiumos/platform/mtplot"
-inherit autotools cros-workon
-
-DESCRIPTION="Multitouch Contact Plotter"
-CROS_WORKON_LOCALNAME="../platform/mtplot"
-HOMEPAGE="http://src.chromium.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/Manifest
deleted file mode 100644
index 4c90f30f7e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xinit-1.3.0.tar.bz2 138315 RMD160 6759083ed787beace9f485e69d46b97fb397edbd SHA1 6437292214bbca6efad8889c68e72a1ca584928b SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/0001-Gentoo-customizations.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/0001-Gentoo-customizations.patch
deleted file mode 100644
index a25ef4ba2a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/0001-Gentoo-customizations.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <scarabeus@gentoo.org>
-Date: Mon, 1 Nov 2010 16:46:36 +0100
-Subject: [PATCH] Gentoo customizations.
-
-
-Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org>
----
- xinitrc.cpp |   26 ++++++++++++++++++--------
- 1 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/xinitrc.cpp b/xinitrc.cpp
-index 049a8e4..80c3ad9 100644
---- a/xinitrc.cpp
-+++ b/xinitrc.cpp
-@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
- 
- userresources=$HOME/.Xresources
- usermodmap=$HOME/.Xmodmap
--sysresources=XINITDIR/.Xresources
--sysmodmap=XINITDIR/.Xmodmap
-+sysresources=XINITDIR/Xresources
-+sysmodmap=XINITDIR/Xmodmap
- 
- XCOMM merge in defaults and keymaps
- 
-@@ -84,15 +84,25 @@ fi
- XCOMM This is the fallback case if nothing else is executed above
- #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
- 
-+if [ -n "`/etc/X11/chooser.sh`" ]; then
-+	command="`/etc/X11/chooser.sh`"
-+else
-+	failsafe="yes"
-+fi
-+
- if [ -d XINITDIR/xinitrc.d ] ; then
--	for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
-+	for f in XINITDIR/xinitrc.dXSLASHGLOB ; do
- 		[ -x "$f" ] && . "$f"
- 	done
- 	unset f
- fi
- 
--TWM &
--XCLOCK -geometry 50x50-1+1 &
--XTERM -geometry 80x50+494+51 &
--XTERM -geometry 80x20+494-0 &
--exec XTERM -geometry 80x66+0+0 -name login
-+if [ -n "$failsafe" ]; then
-+	TWM &
-+	XCLOCK -geometry 50x50-1+1 &
-+	XTERM -geometry 80x50+494+51 &
-+	XTERM -geometry 80x20+494-0 &
-+	exec XTERM -geometry 80x66+0+0 -name login
-+else
-+	exec $command
-+fi
--- 
-1.7.3.1
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/Xsession b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/Xsession
deleted file mode 100644
index c86ccee19f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/Xsession
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
-
-case $# in
-1)
-	case $1 in
-	failsafe)
-		exec xterm -geometry 80x24-0-0
-		;;
-	esac
-esac
-
-# redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
-
-# clean up after xbanner
-if which freetemp 2> /dev/null ; then
-	freetemp
-fi
-
-startup=$HOME/.xsession
-
-userresources=$HOME/.Xresources 
-usermodmap=$HOME/.Xmodmap 
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources 
-sysmodmap=/etc/X11/Xmodmap 
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources 
-rh6sysmodmap=/etc/X11/xinit/Xmodmap 
-
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
-    xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
-    xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-    setxkbmap `cat "$sysxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-    setxkbmap `cat "$userxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-       if [ -n "$xkbsymbols" ]; then
-           setxkbmap -symbols "$xkbsymbols"
-           XKB_IN_USE=yes
-       fi
-    fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
-    if [ -f "$rh6sysmodmap" ]; then
-       xmodmap "$rh6sysmodmap"
-    fi
-
-    if [ -f "$sysmodmap" ]; then
-       xmodmap "$sysmodmap"
-    fi
-
-    if [ -f "$usermodmap" ]; then
-       xmodmap "$usermodmap"
-    fi
-fi
-
-unset XKB_IN_USE
-
-if [ -x "$startup" ]; then
-	exec "$startup"
-elif [ -x "$HOME/.Xclients" ]; then
-	exec "$HOME/.Xclients"
-elif [ -x /etc/X11/xinit/Xclients ]; then
-	exec /etc/X11/xinit/Xclients
-elif [ -x /etc/X11/Xclients ]; then
-	exec /etc/X11/Xclients
-else
-	exec xsm
-fi
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/chooser.sh b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/chooser.sh
deleted file mode 100644
index f24be46dc4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/chooser.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.5 2009/11/14 14:18:43 scarabeus Exp $
-
-# Find a match for $XSESSION in /etc/X11/Sessions
-GENTOO_SESSION=""
-for x in /etc/X11/Sessions/* ; do
-	if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
-		= "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]; then
-		GENTOO_SESSION=${x}
-		break
-	fi
-done
-
-GENTOO_EXEC=""
-
-if [ -n "${XSESSION}" ]; then
-	if [ -f /etc/X11/Sessions/${XSESSION} ]; then
-		if [ -x /etc/X11/Sessions/${XSESSION} ]; then
-			GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}"
-		else
-			GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}"
-		fi
-	elif [ -n "${GENTOO_SESSION}" ]; then
-		if [ -x "${GENTOO_SESSION}" ]; then
-			GENTOO_EXEC="${GENTOO_SESSION}"
-		else
-			GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}"
-		fi
-	else
-		x=""
-		y=""
-		
-		for x in "${XSESSION}" \
-			"`echo ${XSESSION} | awk '{ print toupper($1) }'`" \
-			"`echo ${XSESSION} | awk '{ print tolower($1) }'`"
-		do
-			# Fall through ...
-			if [ -x "`which ${x} 2>/dev/null`" ]; then
-				GENTOO_EXEC="`which ${x} 2>/dev/null`"
-				break
-			fi
-		done
-	fi
-fi
-
-echo "${GENTOO_EXEC}"
-
-
-# vim:ts=4
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/startDM.sh b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/startDM.sh
deleted file mode 100644
index 9775b07ff7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/startDM.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.4 2007/04/05 15:30:19 uberlord Exp $
-
-# We need to source /etc/profile for stuff like $LANG to work
-# bug #10190.
-. /etc/profile
-
-. /etc/init.d/functions.sh
-
-# baselayout-1 compat
-if ! type get_options >/dev/null 2>/dev/null ; then
-	[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
-fi
-
-# Great new Gnome2 feature, AA
-# We enable this by default
-export GDK_USE_XFT=1
-
-export SVCNAME=xdm
-EXEC="$(get_options service)"
-NAME="$(get_options name)"
-PIDFILE="$(get_options pidfile)"
-
-start-stop-daemon --start --exec ${EXEC} \
-${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} || \
-eerror "ERROR: could not start the Display Manager"
-
-# vim:ts=4
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch
deleted file mode 100644
index 838171bb67..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/xinit.c b/xinit.c
-index 42ff008..2ab817f 100644
---- a/xinit.c
-+++ b/xinit.c
-@@ -49,10 +49,8 @@ in this Software without prior written authorization from The Open Group.
- #endif
- 
- /* For PRIO_PROCESS and setpriority() */
--#ifdef __DragonFly__
- #include <sys/time.h>
- #include <sys/resource.h>
--#endif /* __DragonFly__ */
- 
- #include <stdlib.h>
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xserverrc b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xserverrc
deleted file mode 100644
index b4de252874..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xserverrc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/xinit-1.3.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/xinit-1.3.0-r2.ebuild
deleted file mode 100644
index 2845869db2..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/xinit-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r1.ebuild,v 1.3 2010/12/19 12:21:00 ssuominen Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="X Window System initializer"
-
-LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="+minimal"
-
-RDEPEND="
-	!<x11-base/xorg-server-1.8.0
-	x11-apps/xauth
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-PDEPEND="x11-apps/xrdb
-	!minimal? (
-		x11-apps/xclock
-		x11-apps/xsm
-		x11-terms/xterm
-		x11-wm/twm
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/0001-Gentoo-customizations.patch"
-	"${FILESDIR}/${PN}-1.3.1-prio-process.patch"
-)
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	CONFIGURE_OPTIONS="--with-xinitdir=/etc/X11/xinit"
-}
-
-src_install() {
-	xorg-2_src_install
-
-	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/Xsession || die
-	exeinto /etc/X11/xinit
-	doexe "${FILESDIR}"/xserverrc || die
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/00-xhost"
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
-	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
-	ewarn "any executable. When you run startx, it will run this as the login session."
-	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
-	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
-	ewarn "Here's an example of setting it for the whole system:"
-	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
-	ewarn "    env-update && source /etc/profile"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/Makefile b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/Makefile
deleted file mode 100644
index 9afd0f22d4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LDLIBS = -lXmuu -lX11
-CFLAGS += -Wall
-all: xset
-install:
-	mkdir -p $(DESTDIR)/usr/bin
-	install -m 755 xset $(DESTDIR)/usr/bin/xset-mini
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/xset.c b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/xset.c
deleted file mode 100644
index 68d25ba1d2..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/xset.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
-
-Copyright 1985, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* Modified by Stephen so keyboard rate is set using XKB extensions */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <X11/Xos.h>
-#include <X11/Xfuncs.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
-#include <X11/Xmu/Error.h>
-#include <X11/XKBlib.h>
-
-#define ON 1
-#define OFF 0
-
-#define SERVER_DEFAULT (-1)
-#define DONT_CHANGE -2
-
-#define ALL -1
-
-#define XKBDDELAY_DEFAULT 660
-#define XKBDRATE_DEFAULT (1000/40)
-
-static char *progName;
-
-static int error_status = 0;
-
-static int is_number(char *arg, int maximum);
-static void set_mouse(Display *dpy, int acc_num, int acc_denom, int threshold);
-static void set_repeat(Display *dpy, int key, int auto_repeat_mode);
-static void usage(char *fmt, ...) _X_NORETURN;
-static int local_xerror(Display *dpy, XErrorEvent *rep);
-
-static void xkbset_repeatrate(Display *dpy, int delay, int rate);
-
-int
-main(int argc, char *argv[])
-{
-    register char *arg;
-    register int i;
-    int acc_num, acc_denom, threshold;
-
-    int key, auto_repeat_mode;
-
-    char *disp = NULL;
-    Display *dpy;
-
-    int miscpresent = 0;
-    int xkbpresent = 0;
-
-    int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion;
-    int xkbopcode, xkbevent, xkberror;
-
-    progName = argv[0];
-    if (argc < 2) {
-	usage(NULL, NULL);	       /* replace with window interface */
-    }
-
-    dpy = XOpenDisplay(disp);    /*  Open display and check for success */
-    if (dpy == NULL) {
-	fprintf(stderr, "%s:  unable to open display \"%s\"\n",
-		argv[0], XDisplayName(disp));
-	exit(EXIT_FAILURE);
-    }
-    XSetErrorHandler(local_xerror);
-    for (i = 1; i < argc;) {
-	arg = argv[i++];
-/*  Set pointer (mouse) settings:  Acceleration and Threshold. */
-	if (strcmp(arg, "m") == 0 || strcmp(arg, "mouse") == 0) {
-	    acc_num = SERVER_DEFAULT;		/* restore server defaults */
-	    acc_denom = SERVER_DEFAULT;
-	    threshold = SERVER_DEFAULT;
-	    if (i >= argc) {
-		set_mouse(dpy, acc_num, acc_denom, threshold);
-		break;
-	    }
-	    arg = argv[i];
-	    if (strcmp(arg, "default") == 0) {
-		i++;
-	    } else if (*arg >= '0' && *arg <= '9') {
-		acc_denom = 1;
-		sscanf(arg, "%d/%d", &acc_num, &acc_denom);
-		i++;
-		if (i >= argc) {
-		    set_mouse(dpy, acc_num, acc_denom, threshold);
-		    break;
-		}
-		arg = argv[i];
-		if (*arg >= '0' && *arg <= '9') {
-		    threshold = atoi(arg); /* Set threshold as user specified. */
-		    i++;
-		}
-	    }
-	    set_mouse(dpy, acc_num, acc_denom, threshold);
-	} else if (strcmp(arg, "-r") == 0) {		/* Turn off one or
-							   all autorepeats */
-	    auto_repeat_mode = OFF;
-	    key = ALL;		       			/* None specified */
-	    arg = argv[i];
-	    if (i < argc)
-		if (is_number(arg, 255)) {
-		    key = atoi(arg);
-		    i++;
-		}
-	    set_repeat(dpy, key, auto_repeat_mode);
-	} else if (strcmp(arg, "r") == 0) {		/* Turn on one or
-							   all autorepeats */
-	    auto_repeat_mode = ON;
-	    key = ALL;		       			/* None specified */
-	    arg = argv[i];
-	    if (i < argc) {
-		if (strcmp(arg, "on") == 0) {
-		    i++;
-		} else if (strcmp(arg, "off") == 0) {	/*  ...except in
-							    this case */
-		    auto_repeat_mode = OFF;
-		    i++;
-		}
-		else if (strcmp(arg, "rate") == 0) {	/*  ...or this one. */
-		    int delay = 0, rate = 0;
-
-		    if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent,
-					  &xkberror, &xkbmajor, &xkbminor)) {
-			delay = XKBDDELAY_DEFAULT;
-			rate = XKBDRATE_DEFAULT;
-			xkbpresent = 1;
-		    }
-		    if (!xkbpresent && !miscpresent)
-			fprintf(stderr,
-				"server does not have extension for \"r rate\" option\n");
-		    i++;
-		    arg = argv[i];
-		    if (i < argc) {
-			if (is_number(arg, 10000) && atoi(arg) > 0) {
-			    delay = atoi(arg);
-			    i++;
-			    arg = argv[i];
-			    if (i < argc) {
-				if (is_number(arg, 255) && atoi(arg) > 0) {
-				    rate = atoi(arg);
-				    i++;
-				}
-			    }
-			}
-		    }
-		    if (xkbpresent) {
-			xkbset_repeatrate(dpy, delay, 1000 / rate);
-		    }
-		}
-		else if (is_number(arg, 255)) {
-		    key = atoi(arg);
-		    i++;
-		}
-	    }
-	    set_repeat(dpy, key, auto_repeat_mode);
-	} else
-	    usage("unknown option %s", arg);
-    }
-
-    XCloseDisplay(dpy);
-
-    exit(error_status);		       /*  Done.  We can go home now.  */
-}
-
-static int
-is_number(char *arg, int maximum)
-{
-    register char *p;
-
-    if (arg[0] == '-' && arg[1] == '1' && arg[2] == '\0')
-	return (1);
-    for (p = arg; isdigit(*p); p++) ;
-    if (*p || atoi(arg) > maximum)
-	return (0);
-    return (1);
-}
-
-static void
-set_mouse(Display *dpy, int acc_num, int acc_denom, int threshold)
-{
-    int do_accel = True, do_threshold = True;
-
-    if (acc_num == DONT_CHANGE)	       /* what an incredible crock... */
-	do_accel = False;
-    if (threshold == DONT_CHANGE)
-	do_threshold = False;
-    if (acc_num < 0)		       /* shouldn't happen */
-	acc_num = SERVER_DEFAULT;
-    if (acc_denom <= 0)		       /* prevent divide by zero */
-	acc_denom = SERVER_DEFAULT;
-    if (threshold < 0)
-	threshold = SERVER_DEFAULT;
-    XChangePointerControl(dpy, do_accel, do_threshold, acc_num,
-			  acc_denom, threshold);
-    return;
-}
-
-static void
-set_repeat(Display *dpy, int key, int auto_repeat_mode)
-{
-    XKeyboardControl values;
-
-    values.auto_repeat_mode = auto_repeat_mode;
-    if (key != ALL) {
-	values.key = key;
-	XChangeKeyboardControl(dpy, KBKey | KBAutoRepeatMode, &values);
-    } else {
-	XChangeKeyboardControl(dpy, KBAutoRepeatMode, &values);
-    }
-    return;
-}
-
-static void
-xkbset_repeatrate(Display *dpy, int delay, int interval)
-{
-    XkbDescPtr xkb = XkbAllocKeyboard();
-
-    if (!xkb)
-	return;
-    XkbGetControls(dpy, XkbRepeatKeysMask, xkb);
-    xkb->ctrls->repeat_delay = delay;
-    xkb->ctrls->repeat_interval = interval;
-    XkbSetControls(dpy, XkbRepeatKeysMask, xkb);
-    XkbFreeKeyboard(xkb, 0, True);
-}
-
-/*  This is the usage function */
-
-static void
-usage(char *fmt, ...)
-{
-    va_list ap;
-
-    if (fmt) {
-	fprintf(stderr, "%s:  ", progName);
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	fprintf(stderr, "\n\n");
-    }
-
-    fprintf(stderr, "usage:  %s option ...\n", progName);
-    fprintf(stderr, "    To set mouse acceleration and threshold:\n");
-    fprintf(stderr, "\t m [acc_mult[/acc_div] [thr]]    m default\n");
-    fprintf(stderr, "    To set pixel colors:\n");
-    fprintf(stderr, "\t-r [keycode]        r off\n");
-    fprintf(stderr, "\t r [keycode]        r on\n");
-    fprintf(stderr, "\t r rate [delay [rate]]\n");
-    exit(EXIT_SUCCESS);
-}
-
-static int
-local_xerror(Display *dpy, XErrorEvent *rep)
-{
-    if (rep->request_code == X_SetFontPath && rep->error_code == BadValue) {
-	fprintf(stderr,
-		"%s:  bad font path element (#%ld), possible causes are:\n",
-		progName, rep->resourceid);
-	fprintf(stderr,
-		"    Directory does not exist or has wrong permissions\n");
-	fprintf(stderr, "    Directory missing fonts.dir\n");
-	fprintf(stderr, "    Incorrect font server address or syntax\n");
-    } else if (rep->request_code == X_StoreColors) {
-	switch (rep->error_code) {
-	  case BadAccess:
-	    fprintf(stderr,
-		    "%s:  pixel not allocated read/write\n", progName);
-	    break;
-	  case BadValue:
-	    fprintf(stderr,
-		    "%s:  cannot store in pixel 0x%lx, invalid pixel number\n",
-		    progName, rep->resourceid);
-	    break;
-	  default:
-	    XmuPrintDefaultErrorMessage(dpy, rep, stderr);
-	}
-    } else
-	XmuPrintDefaultErrorMessage(dpy, rep, stderr);
-
-    error_status = -1;
-
-    return (0);
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/xset-mini-1.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/xset-mini-1.2.2.ebuild
deleted file mode 100644
index 4798900430..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/xset-mini-1.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r1.ebuild,v 1.3 2010/12/19 12:21:00 ssuominen Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="X.Org xset application stripped down for just 'r' and 'm' commands"
-HOMEPAGE="http://xorg.freedesktop.org/"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="+minimal"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${FILESDIR}"/* ./ || die
-}
-
-src_configure() {
-	tc-export CC
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/Manifest
deleted file mode 100644
index 64fb90e8b0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST _1.0.2.orig.tar.gz 175083 SHA256 04f8c10b256e0914a38242fc4faa96d8ca64d15f546240ab8b3b491ec5e4fe33 SHA512 4d92abb61b1fa15a930bd213ada01d388c3daa603132207663b32c3b39f2137541ab145eae0e9980ce767aba77a332a4eba769ecfba92da15e90f495edf25440 WHIRLPOOL dca6970fd82cd8d3f4698d4e74b831a7ef72283e8d83f914195bb65335479ea0b0fe49f3f62fab15ff8899efecb01e583f2867be7dd8d9a2e98695f95085086c
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-print-uptime.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-print-uptime.patch
deleted file mode 100644
index 6bb7fe919f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-print-uptime.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6f41217..ee8f40c 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -488,7 +488,8 @@ distdir: $(DISTFILES)
- 	  fi; \
- 	done
- 	-test -n "$(am__skip_mode_fix)" \
--	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	|| find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -532,17 +533,17 @@ dist dist-all: distdir
- distcheck: dist
- 	case '$(DIST_ARCHIVES)' in \
- 	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
--	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- 	*.tar.lzma*) \
--	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- 	*.tar.xz*) \
- 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
-diff --git a/configure b/configure
-index f25c412..3b328b7 100755
---- a/configure
-+++ b/configure
-@@ -4837,6 +4837,54 @@ else
- fi
- 
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-+if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrt  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char clock_gettime ();
-+int
-+main ()
-+{
-+return clock_gettime ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_rt_clock_gettime=yes
-+else
-+  ac_cv_lib_rt_clock_gettime=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-+if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBRT 1
-+_ACEOF
-+
-+  LIBS="-lrt $LIBS"
-+
-+else
-+  as_fn_error "Could not find librt" "$LINENO" 5
-+fi
-+
-+
- 
- ac_config_files="$ac_config_files Makefile"
- 
-diff --git a/configure.ac b/configure.ac
-index d611b38..583cf97 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,6 +24,8 @@ LIBS="$LIBS -lsocket -lnsl"; break],[AC_MSG_ERROR([Could not find socket library
- fi
- AC_CHECK_FUNC([getaddrinfo],,[AC_MSG_ERROR([Could not find getaddrinfo library function])])
- 
-+AC_CHECK_LIB(rt, clock_gettime, , [AC_MSG_ERROR([Could not find librt])])
-+
- dnl AC_CHECK_HEADER(X11/X.h,[],[AC_MSG_ERROR([Could not find X11/X.h])])
- dnl AC_CHECK_HEADER(X11/Xlib.h,[],[AC_MSG_ERROR([Could not find X11/Xlib.h])])
- dnl AC_CHECK_HEADER(X11/extensions/security.h,[],[AC_MSG_ERROR([Could not find X11/extensions/secruity.h])],[#include <X11/Xlib.h>])
-diff --git a/main.c b/main.c
-index b6b27a6..a8e1725 100644
---- a/main.c
-+++ b/main.c
-@@ -45,6 +45,7 @@ bool denyallextensions = false;
- bool interactive = false;
- bool print_timestamps = false;
- bool print_reltimestamps = false;
-+bool print_uptime = false;
- static bool buffered = false;
- size_t maxshownlistlen = SIZE_MAX;
- 
-@@ -390,7 +391,7 @@ char *strndup(const char *str,size_t n) {
- }
- #endif
- 
--enum {LO_DEFAULT=0, LO_TIMESTAMPS, LO_RELTIMESTAMPS, LO_VERSION, LO_HELP};
-+enum {LO_DEFAULT=0, LO_TIMESTAMPS, LO_RELTIMESTAMPS, LO_UPTIME, LO_VERSION, LO_HELP};
- static int long_only_option = 0;
- static const struct option longoptions[] = {
- 	{"display",	required_argument,	NULL,	'd'},
-@@ -412,6 +413,7 @@ static const struct option longoptions[] = {
- 	{"version",		no_argument, &long_only_option,	LO_VERSION},
- 	{"timestamps",		no_argument, &long_only_option,	LO_TIMESTAMPS},
- 	{"relative-timestamps",	no_argument, &long_only_option,	LO_RELTIMESTAMPS},
-+	{"uptime",		no_argument, &long_only_option,	LO_UPTIME},
- 	{NULL,		0,			NULL,	0}
- };
- 
-@@ -526,6 +528,9 @@ argv[0]);
- 				 case LO_RELTIMESTAMPS:
- 					 print_reltimestamps = true;
- 					 break;
-+				 case LO_UPTIME:
-+					 print_uptime = true;
-+					 break;
- 			 }
- 			 break;
- 		 case ':':
-diff --git a/parse.c b/parse.c
-index 8bdd363..b808766 100644
---- a/parse.c
-+++ b/parse.c
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <sys/select.h>
-+#include <time.h>
- #include <unistd.h>
- 
- #include "xtrace.h"
-@@ -46,6 +47,7 @@ static inline unsigned int padded(unsigned int s) {
- static void startline(struct connection *c, enum package_direction d, const char *format, ...) {
- 	va_list ap;
- 	struct timeval tv;
-+	struct timespec ts;
- 
- 	if( (print_timestamps || print_reltimestamps)
- 			&& gettimeofday(&tv, NULL) == 0 ) {
-@@ -60,6 +62,10 @@ static void startline(struct connection *c, enum package_direction d, const char
- 				(unsigned int)((tt - c->starttime)%1000));
- 		}
- 	}
-+	if( print_uptime && clock_gettime(CLOCK_MONOTONIC, &ts ) == 0 ) {
-+		fprintf(out, "%lu.%03u ", (unsigned long)ts.tv_sec,
-+			(unsigned int)(ts.tv_nsec/1000000));
-+	}
- 	va_start(ap, format);
- 	fprintf(out, "%03d:%c:", c->id, (d == TO_SERVER)?'<':'>');
- 	vfprintf(out, format, ap);
-@@ -1749,4 +1755,3 @@ const struct extension *find_extension(const uint8_t *name,size_t len) {
- 
- 	return NULL;
- }
--
-diff --git a/xtrace.h b/xtrace.h
-index 95a725a..1c9bd4a 100644
---- a/xtrace.h
-+++ b/xtrace.h
-@@ -46,6 +46,7 @@ extern bool denyallextensions;
- extern size_t maxshownlistlen;
- extern bool print_timestamps;
- extern bool print_reltimestamps;
-+extern bool print_uptime;
- 
- #ifdef __GNUC__
- #define UNUSED __attribute__ ((unused))
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-sync-extension.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-sync-extension.patch
deleted file mode 100644
index 80a2c7ed86..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-sync-extension.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index ba359c2..c611a14 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -12,7 +12,7 @@ dist_man_MANS = xtrace.1
- 
- MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/configure $(srcdir)/stamp-h.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
- 
--dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto vidmode.proto xinerama.proto xinput.proto xkb.proto
-+dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto sync.proto vidmode.proto xinerama.proto xinput.proto xkb.proto
- 
- distclean-local:
- 	-rm -rf $(srcdir)/autom4te.cache
-diff --git a/Makefile.in b/Makefile.in
-index 6f41217..a611645 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -204,7 +204,7 @@ xtrace_LDFLAGS = -Wl,-z,defs
- noinst_HEADERS = xtrace.h parse.h stringlist.h translate.h
- dist_man_MANS = xtrace.1
- MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/configure $(srcdir)/stamp-h.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
--dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto vidmode.proto xinerama.proto xinput.proto xkb.proto
-+dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto sync.proto vidmode.proto xinerama.proto xinput.proto xkb.proto
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff --git a/all.proto b/all.proto
-index b2fd22d..23d873d 100644
---- a/all.proto
-+++ b/all.proto
-@@ -14,6 +14,7 @@ NEEDS "randr.proto"
- NEEDS "render.proto"
- NEEDS "saver.proto"
- NEEDS "shape.proto"
-+NEEDS "sync.proto"
- NEEDS "vidmode.proto"
- NEEDS "xinerama.proto"
- NEEDS "xinput.proto"
-diff --git a/sync.proto b/sync.proto
-new file mode 100644
-index 0000000..e593c18
---- /dev/null
-+++ b/sync.proto
-@@ -0,0 +1,154 @@
-+EXTENSION "SYNC" Sync
-+USE core
-+
-+REQUESTS
-+Initialize RESPONDS
-+ListSystemCounters RESPONDS
-+CreateCounter
-+SetCounter
-+ChangeCounter
-+QueryCounter RESPONDS
-+DestroyCounter
-+Await
-+CreateAlarm
-+ChangeAlarm
-+QueryAlarm RESPONDS
-+DestroyAlarm
-+SetPriority
-+GetPriority RESPONDS
-+END
-+
-+EVENTS
-+CounterNotify
-+AlarmNotify
-+END
-+
-+ERRORS
-+BadCounter
-+BadAlarm
-+END
-+
-+CONSTANTS alarm_state
-+0	Active
-+1	Inactive
-+2	Destroyed
-+END
-+TYPE ALARM_STATE	ENUM8	alarm_state
-+
-+CONSTANTS test_type
-+0	PositiveTransition
-+1	NegativeTransition
-+2	PositiveComparison
-+3	NegativeComparison
-+END
-+TYPE TEST_TYPE	ENUM32	test_type
-+
-+REQUEST Initialize
-+ 4	major-version	UINT8
-+ 5	minor-version	UINT8
-+END
-+RESPONSE Initialize
-+ 8	major-version	UINT16
-+ 9	minor-version	UINT16
-+END
-+
-+REQUEST ListSystemCounters ALIASES Empty
-+RESPONSE ListSystemCounters
-+ 8	num-counters	INT32
-+END
-+
-+REQUEST CreateCounter
-+ 4	counter	UINT32
-+ 8	initial-value-high	INT32
-+12	initial-value-low	UINT32
-+END
-+
-+REQUEST SetCounter
-+ 4	counter	UINT32
-+ 8	initial-value-high	INT32
-+12	initial-value-low	UINT32
-+END
-+
-+REQUEST ChangeCounter
-+ 4	counter	UINT32
-+ 8	initial-value-high	INT32
-+12	initial-value-low	UINT32
-+END
-+
-+REQUEST QueryCounter
-+ 4	counter	UINT32
-+END
-+RESPONSE QueryCounter
-+ 8	value-high	INT32
-+12	value-low	UINT32
-+END
-+
-+REQUEST DestroyCounter
-+ 4	counter	UINT32
-+END
-+
-+REQUEST Await ALIASES Empty
-+
-+REQUEST CreateAlarm
-+ 4	alarm	UINT32
-+ 8	value-mask	UINT32
-+END
-+
-+REQUEST ChangeAlarm
-+ 4	alarm	UINT32
-+ 8	value-mask	UINT32
-+END
-+
-+REQUEST QueryAlarm
-+ 4	alarm	UINT32
-+END
-+RESPONSE QueryAlarm
-+ 8	counter	UINT32
-+12	value-type	UINT32
-+16	wait-value-high	INT32
-+20	wait-value-low	UINT32
-+24	test-type	TEST_TYPE
-+28	delta-high	INT32
-+32	delta-low	UINT32
-+36	events	BOOL
-+37	state	ALARM_STATE
-+END
-+
-+REQUEST DestroyAlarm
-+ 4	alarm	UINT32
-+END
-+
-+REQUEST SetPriority
-+ 4	id	UINT32
-+ 8	priority	INT32
-+END
-+
-+REQUEST GetPriority
-+ 4	id	UINT32
-+END
-+RESPONSE GetPriority
-+ 8	priority	INT32
-+END
-+
-+EVENT CounterNotify
-+ 4	counter	UINT32
-+ 8	wait-value-high	INT32
-+12	wait-value-low	UINT32
-+16	counter-value-high	INT32
-+20	counter-value-low	UINT32
-+24	time	TIMESTAMP
-+28	count	INT16
-+30	destroyed	BOOL
-+END
-+
-+EVENT AlarmNotify
-+ 4	alarm	UINT32
-+ 8	counter-value-high	INT32
-+12	counter-value-low	UINT32
-+16	alarm-value-high	INT32
-+20	alarm-value-low	UINT32
-+24	time	TIMESTAMP
-+28	state	ALARM_STATE
-+END
-+
-+EOF
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/xtrace-1.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/xtrace-1.0.2.ebuild
deleted file mode 100644
index 058250f47c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/xtrace-1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="X11 proxy that logs communication between a client and a server"
-HOMEPAGE="http://xtrace.alioth.debian.org/"
-SRC_URI="http://alioth.debian.org/frs/download.php/3201/${MY_PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-print-uptime.patch
-	epatch "${FILESDIR}"/${PV}-sync-extension.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild
deleted file mode 100644
index 12e60a3b12..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild,v 1.3 2012/03/24 16:30:25 chithanh Exp $
-
-EAPI=4
-
-DESCRIPTION="Meta package containing deps on all xorg drivers"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_cmt
-	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
-"
-IUSE_VIDEO_CARDS="
-	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_neomagic
-	video_cards_newport
-	video_cards_nouveau
-	video_cards_nv
-	video_cards_omapfb
-	video_cards_qxl
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3
-	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_v4l
-	video_cards_vesa
-	video_cards_via
-	video_cards_virtualbox
-	video_cards_vmware
-	video_cards_voodoo
-	video_cards_fglrx
-	video_cards_nvidia
-"
-
-IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
-
-PDEPEND="
-	input_devices_acecad?      ( x11-drivers/xf86-input-acecad )
-	input_devices_aiptek?      ( x11-drivers/xf86-input-aiptek )
-	input_devices_cmt?         ( x11-drivers/xf86-input-cmt )
-	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_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_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_omapfb?        ( x11-drivers/xf86-video-omapfb )
-	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_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_v4l?           ( x11-drivers/xf86-video-v4l )
-	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-1.2.3
-	!<=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-s3virge-1.10.4
-	!<=x11-drivers/xf86-video-sisusb-0.9.4
-	!x11-drivers/xf86-video-sunbw2
-	!<=x11-drivers/xf86-video-tseng-1.2.4
-"
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/Manifest
deleted file mode 100644
index 13178d6246..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-allow-root-none.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-allow-root-none.patch
deleted file mode 100644
index e00f555cd0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-allow-root-none.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/dix/window.c b/dix/window.c
-index 823294b..d293e90 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -1083,12 +1083,8 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
-             if (pixID == None) {
-                 if (pWin->backgroundState == BackgroundPixmap)
-                     (*pScreen->DestroyPixmap) (pWin->background.pixmap);
--                if (!pWin->parent)
--                    SetRootWindowBackground(pWin, pScreen, &index2);
--                else {
--                    pWin->backgroundState = XaceBackgroundNoneState(pWin);
--                    pWin->background.pixel = pScreen->whitePixel;
--                }
-+                pWin->backgroundState = XaceBackgroundNoneState(pWin);
-+                pWin->background.pixel = pScreen->whitePixel;
-             }
-             else if (pixID == ParentRelative) {
-                 if (pWin->parent &&
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch
deleted file mode 100644
index c357c03ad8..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch
+++ /dev/null
@@ -1,333 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index f94b88c..03beb36 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -515,9 +515,9 @@ AC_MSG_RESULT([$FONTPATH])
- AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
- 				[ XKBPATH="$withval" ],
- 				[ XKBPATH="${datadir}/X11/xkb" ])
--AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
-+AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]),
- 				[ XKBOUTPUT="$withval" ],
--				[ XKBOUTPUT="compiled" ])
-+				[ XKBOUTPUT="${localstatedir}/cache/xkb" ])
- AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
-                                    [Keyboard ruleset (default: base/evdev)]),
-                                 [ XKB_DFLT_RULES="$withval" ],
-@@ -1202,7 +1202,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir])
- dnl Make sure XKM_OUTPUT_DIR is an absolute path
- XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
- if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
--   XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
-+   AC_MSG_ERROR([xkb-output must be an absolute path.])
- fi
- 
- dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-diff --git a/xkb/README.compiled b/xkb/README.compiled
-index 71caa2f..a4a2ae0 100644
---- a/xkb/README.compiled
-+++ b/xkb/README.compiled
-@@ -4,10 +4,10 @@ current keymap and/or any scratch keymaps used by clients.  The X server
- or some other tool might destroy or replace the files in this directory,
- so it is not a safe place to store compiled keymaps for long periods of
- time.  The default keymap for any server is usually stored in:
--     X<num>-default.xkm
--where <num> is the display number of the server in question, which makes
--it possible for several servers *on the same host* to share the same 
--directory.
-+     server-<SHA1>.xkm
-+
-+where <SHA1> is the SHA1 hash of keymap source, so that compiled
-+keymap of different keymap sources are stored in different files.
- 
- Unless the X server is modified, sharing this directory between servers on
- different hosts could cause problems.
-diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
-index 1961423..411b677 100644
---- a/xkb/ddxLoad.c
-+++ b/xkb/ddxLoad.c
-@@ -30,6 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
- #include <xkb-config.h>
- 
-+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
-+# include <sha1.h>
-+#else /* Use OpenSSL's libcrypto */
-+# include <stddef.h>  /* buggy openssl/sha.h wants size_t */
-+# include <openssl/sha.h>
-+#endif
- #include <stdio.h>
- #include <ctype.h>
- #include <X11/X.h>
-@@ -43,20 +49,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #define	XKBSRV_NEED_FILE_FUNCS
- #include <xkbsrv.h>
- #include <X11/extensions/XI.h>
-+#include <errno.h>
- #include "xkb.h"
- 
--        /*
--         * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
--         * relative to the top-level XKB configuration directory.
--         * Making the server write to a subdirectory of that directory
--         * requires some work in the general case (install procedure
--         * has to create links to /var or somesuch on many machines),
--         * so we just compile into /usr/tmp for now.
--         */
--#ifndef XKM_OUTPUT_DIR
--#define	XKM_OUTPUT_DIR	"compiled/"
--#endif
--
- #define	PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
- #define	ERROR_PREFIX	"\"> \""
- #define	POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
-@@ -166,13 +161,56 @@ OutputDirectory(char *outdir, size_t size)
- }
- 
- static Bool
-+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input)
-+{
-+    int i;
-+    unsigned char sha1[SHA_DIGEST_LENGTH];
-+
-+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
-+    SHA1_CTX ctx;
-+
-+    SHA1Init (&ctx);
-+    SHA1Update (&ctx, input, strlen(input));
-+    SHA1Final (sha1, &ctx);
-+#else /* Use OpenSSL's libcrypto */
-+    SHA_CTX ctx;
-+    int success;
-+
-+    success = SHA1_Init (&ctx);
-+    if (! success)
-+	return BadAlloc;
-+
-+    success = SHA1_Update (&ctx, input, strlen(input));
-+    if (! success)
-+	return BadAlloc;
-+
-+    success = SHA1_Final (sha1, &ctx);
-+    if (! success)
-+	return BadAlloc;
-+#endif
-+
-+    /* convert sha1 to sha1_asc */
-+    for(i=0; i<SHA_DIGEST_LENGTH; ++i) {
-+	sprintf(sha1Asc+i*2, "%02X", sha1[i]);
-+    }
-+
-+    return Success;
-+}
-+
-+/* call xkbcomp and compile XKB keymap, return xkm file name in
-+   nameRtrn */
-+static Bool
- XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
-                            XkbComponentNamesPtr names,
-                            unsigned want,
-                            unsigned need, char *nameRtrn, int nameRtrnLen)
- {
-     FILE *out;
--    char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX];
-+    char *buf = NULL, xkmfile[PATH_MAX], xkm_output_dir[PATH_MAX];
-+    char *tmpXkmFile = NULL;
-+    char *canonicalXkmFileName = NULL;
-+    char sha1Asc[SHA_DIGEST_LENGTH*2+1], xkbKeyMapBuf[100*1024];
-+    int ret, result;
- 
-     const char *emptystring = "";
-     char *xkbbasedirflag = NULL;
-@@ -183,15 +221,67 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
-     /* WIN32 has no popen. The input must be stored in a file which is
-        used as input for xkbcomp. xkbcomp does not read from stdin. */
-     char tmpname[PATH_MAX];
--    const char *xkmfile = tmpname;
-+    const char *xkbfile = tmpname;
- #else
--    const char *xkmfile = "-";
-+    const char *xkbfile = "-";
-+#endif
-+
-+    /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf',
-+       of which SHA1 is generated and used as result xkm file name  */
-+    memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf));
-+    out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w");
-+    if (NULL == out) {
-+        ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n");
-+        return FALSE;
-+    }
-+    ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need);
-+    if (fclose(out) !=0) {
-+        ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n");
-+        return FALSE;
-+    }
-+#ifdef DEBUG
-+    if (xkbDebugFlags) {
-+        ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
-+        fputs(xkbKeyMapBuf, stderr);
-+    }
- #endif
-+    if (!ret) {
-+        ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n");
-+        return FALSE;
-+    }
- 
--    snprintf(keymap, sizeof(keymap), "server-%s", display);
-+    DebugF("[xkb] computing SHA1 of keymap\n");
-+    if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) {
-+        snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc);
-+    } else {
-+        ErrorF("[xkb] Computing SHA1 of keymap failed, "
-+               "using display name instead as xkm file name\n");
-+        snprintf(xkmfile, sizeof(xkmfile), "server-%s", display);
-+    }
- 
-     OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
- 
-+    /* set nameRtrn, fail if it's too small */
-+    if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) {
-+        ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n");
-+        return FALSE;
-+    }
-+    strncpy(nameRtrn, xkmfile, nameRtrnLen);
-+
-+    /* if the xkm file already exists, reuse it */
-+    canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile);
-+    if (access(canonicalXkmFileName, R_OK) == 0) {
-+        /* yes, we can reuse the old xkm file */
-+        LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName);
-+        result = TRUE;
-+        goto _ret;
-+    }
-+    LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName);
-+
-+    /* continue to call xkbcomp to compile the keymap. to avoid race
-+       condition, we compile it to a tmpfile then rename it to
-+       xkmfile */
-+
- #ifdef WIN32
-     strcpy(tmpname, Win32TempDir());
-     strcat(tmpname, "\\xkb_XXXXXX");
-@@ -214,15 +304,21 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
-         }
-     }
- 
-+    if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) {
-+        ErrorF("[xkb] Can't generate temp xkm file name");
-+        result = FALSE;
-+        goto _ret;
-+    }
-+
-     if (asprintf(&buf,
-                  "\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
--                 "-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
-+                 "-em1 %s -emp %s -eml %s \"%s\"",
-                  xkbbindir, xkbbindirsep,
-                  ((xkbDebugFlags < 2) ? 1 :
-                   ((xkbDebugFlags > 10) ? 10 : (int) xkbDebugFlags)),
--                 xkbbasedirflag ? xkbbasedirflag : "", xkmfile,
-+                 xkbbasedirflag ? xkbbasedirflag : "", xkbfile,
-                  PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
--                 xkm_output_dir, keymap) == -1)
-+                 tmpXkmFile) == -1)
-         buf = NULL;
- 
-     free(xkbbasedirflag);
-@@ -233,6 +329,11 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
-         return FALSE;
-     }
- 
-+    /* there's a potential race condition between calling tempnam()
-+       and invoking xkbcomp to write the result file (potential temp
-+       file name conflicts), but since xkbcomp is a standalone
-+       program, we have to live with this */
-+
- #ifndef WIN32
-     out = Popen(buf, "w");
- #else
-@@ -240,32 +341,41 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
- #endif
- 
-     if (out != NULL) {
--#ifdef DEBUG
--        if (xkbDebugFlags) {
--            ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
--            XkbWriteXKBKeymapForNames(stderr, names, xkb, want, need);
-+        /* write XKBKeyMapBuf to xkbcomp */
-+        if (EOF==fputs(xkbKeyMapBuf, out))
-+        {
-+            ErrorF("[xkb] Sending keymap to xkbcomp failed\n");
-+            result = FALSE;
-+            goto _ret;
-         }
--#endif
--        XkbWriteXKBKeymapForNames(out, names, xkb, want, need);
- #ifndef WIN32
-         if (Pclose(out) == 0)
- #else
-         if (fclose(out) == 0 && System(buf) >= 0)
- #endif
-         {
-+            /* xkbcomp success */
-             if (xkbDebugFlags)
-                 DebugF("[xkb] xkb executes: %s\n", buf);
--            if (nameRtrn) {
--                strlcpy(nameRtrn, keymap, nameRtrnLen);
-+            /* if canonicalXkmFileName already exists now, we simply
-+               overwrite it, this is OK */
-+            ret = rename(tmpXkmFile, canonicalXkmFileName);
-+            if (0 != ret) {
-+                ErrorF("[xkb] Can't rename %s to %s, error: %s\n",
-+                       tmpXkmFile, canonicalXkmFileName,
-+                       strerror(errno));
-+
-+                /* in case of error, don't unlink tmpXkmFile, leave it
-+                   for debugging */
-+
-+                result = FALSE;
-+                goto _ret;
-             }
--            free(buf);
--#ifdef WIN32
--            unlink(tmpname);
--#endif
--            return TRUE;
-+            result = TRUE;
-+            goto _ret;
-         }
-         else
--            LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
-+            LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile);
- #ifdef WIN32
-         /* remove the temporary file */
-         unlink(tmpname);
-@@ -280,8 +390,15 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
-     }
-     if (nameRtrn)
-         nameRtrn[0] = '\0';
-+    result = FALSE;
-+
-+_ret:
-+    if (tmpXkmFile)
-+        free(tmpXkmFile);
-+    if (canonicalXkmFileName)
-+        xfree(canonicalXkmFileName);
-     free(buf);
--    return FALSE;
-+    return result;
- }
- 
- static FILE *
-@@ -368,7 +485,6 @@ XkbDDXLoadKeymapByNames(DeviceIntPtr keybd,
-                (*xkbRtrn)->defined);
-     }
-     fclose(file);
--    (void) unlink(fileName);
-     return (need | want) & (~missing);
- }
- 
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-chromium-mouse-accel-profile.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-chromium-mouse-accel-profile.patch
deleted file mode 100644
index 95778b10b1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-chromium-mouse-accel-profile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
-index 30e14b1..ea447a8 100644
---- a/dix/ptrveloc.c
-+++ b/dix/ptrveloc.c
-@@ -863,6 +863,82 @@ PowerProfile(DeviceIntPtr dev,
- }
- 
- /**
-+ * Computes Acceleration based on the Chromium acceleration algorithm.
-+ * This algorithm was taken from our Chromium MultiTouch touchpad driver.
-+ * We think about acceleration curve taking an input velocity and returning
-+ * an output velocity. The shape of the curve is parabolic at the low end
-+ * and then at a certain point, it continues straight. The curve operates
-+ * in units of inches/second.
-+ *
-+ * Note that X acceleration profile functions operate using very different
-+ * units, generally, so a little bit of gynmastics is required to fit our
-+ * curve to the X convention.
-+ *
-+ * Inputs:
-+ * velocity: mouse velocity in inches per millisecond[1]
-+ * threshold: if greater than 0, the X cutoff in 100ths of an inch/sec
-+ * acc: multiplier applied to output, for user's speed preferences, multiplied
-+ *      by screen resolution (DPI). A good default for the user prefs is 1.0.
-+ *      A good default for the screen resolution is 125.[2]
-+ *
-+ * Outputs:
-+ * Returns a multiplier m such that m * mouse counts = screen pixels.
-+ *
-+ * [1] To get this value to be inches per millisecond, the following xinput
-+ * properties must be set accordingly:
-+ * "Device Accel Velocity Scaling": 1.0
-+ * "Device Accel Constant Deceleration": CPI (Counts per inch)
-+ *
-+ * [2] To set this value for a particular device, do:
-+ * xinput set-ptr-feedback <device> 0 acc 1  # 0=thresh, acc/1 = num/den
-+ * or for all devices(?):
-+ * xset m acc/1 0  # num/den thresh
-+ *
-+ * Note about CPI: CPI is the resolution of the mouse. Many common mice at the
-+ * time of writing have a CPI of approximately 1000, so that may be a good
-+ * default value.
-+ */
-+static double
-+ChromiumMouseProfile(
-+    DeviceIntPtr dev,
-+    DeviceVelocityPtr vel,
-+    double velocity,
-+    double threshold,
-+    double acc)
-+{
-+    /* Parabola: v_out = a * v_in^2 + b * v_in
-+       Line:     v_out = m * v_in + b */
-+    /* These three constants seem to work well */
-+    const float kParabolaA = 1.3;
-+    const float kParabolaB = 0.2;
-+    /* v_in where we switch from parab. to line: */
-+    const float kCutoffX = threshold > 0 ? threshold * 0.01 : 8.0;
-+    const float kCutoffY =
-+            kParabolaA * kCutoffX * kCutoffX + kParabolaB * kCutoffX;
-+    /* d/dx (ax^2 + bx) = 2ax + 1 */
-+    const float kLineM = 2.0 * kParabolaA * kCutoffX + kParabolaB;
-+    const float kLineB = kCutoffY - kCutoffX * kLineM;
-+
-+    float inch_per_sec = velocity * 1000.0;  // inches/ms -> inches/s
-+    float new_inch_per_sec;
-+    if (velocity == 0.0)
-+        return 1.0;
-+
-+    /* acc defaults to a very small value, so if we see it, pick a better
-+       default. It probably means that the user doesn't know how to properly
-+       use this accel profile, but it sucks if we cause super slow mouse
-+       movement. */
-+    if (acc < 50.0)
-+        acc = 225.0;
-+
-+    if (inch_per_sec <= kCutoffX)
-+        return (kParabolaA * inch_per_sec + kParabolaB) * acc;
-+    else
-+        new_inch_per_sec = kLineM * inch_per_sec + kLineB;
-+    return acc * new_inch_per_sec / inch_per_sec;
-+}
-+
-+/**
-  * just a smooth function in [0..1] -> [0..1]
-  *  - point symmetry at 0.5
-  *  - f'(0) = f'(1) = 0
-@@ -988,6 +1064,8 @@ GetAccelerationProfile(DeviceVelocityPtr vel, int profile_num)
-         return LinearProfile;
-     case AccelProfileSmoothLimited:
-         return SmoothLimitedProfile;
-+    case AccelProfileChromiumMouse:
-+        return ChromiumMouseProfile;
-     case AccelProfileNone:
-         return NoProfile;
-     default:
-diff --git a/include/ptrveloc.h b/include/ptrveloc.h
-index 6f999a8..979bd30 100644
---- a/include/ptrveloc.h
-+++ b/include/ptrveloc.h
-@@ -38,7 +38,8 @@
- #define AccelProfilePower 5
- #define AccelProfileLinear 6
- #define AccelProfileSmoothLimited 7
--#define AccelProfileLAST AccelProfileSmoothLimited
-+#define AccelProfileChromiumMouse 8
-+#define AccelProfileLAST AccelProfileChromiumMouse
- 
- /* fwd */
- struct _DeviceVelocityRec;
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-monotonic-clock-fix.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-monotonic-clock-fix.patch
deleted file mode 100644
index 9cb11caa74..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-monotonic-clock-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f1c50bbaf22a272b44d36441811ef9d8483838ca Mon Sep 17 00:00:00 2001
-From: David James <davidjames@google.com>
-Date: Wed, 19 May 2010 09:24:39 -0700
-Subject: [PATCH] Discover monotonic clock using compile-time check.
-
-When xorg-xserver is being cross-compiled, there is currently no way
-for us to detect whether the monotonic clock is available on the
-target system, because we aren't able to run a test program. Currently, in
-this situation, we default to not use the monotonic clock. One problem
-with this situation is that the user will be treated as idle when the date
-is updated.
-
-To fix this situation, we now use a compile-time check to detect whether the
-monotonic clock is available. This check can run just fine when we are
-cross-compiling.
-
-Signed-off-by: David James <davidjames@google.com>
----
- configure.ac |   14 ++++++--------
- 1 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1c7875e..36f7bdd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -935,19 +935,17 @@ if ! test "x$have_clock_gettime" = xno; then
-         CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
-     fi
- 
--    AC_RUN_IFELSE([AC_LANG_SOURCE([
-+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <time.h>
-+#include <unistd.h>
- 
- int main(int argc, char *argv[[]]) {
--    struct timespec tp;
--
--    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
-+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC))
-+        #error No monotonic clock
-+#endif
-         return 0;
--    else
--        return 1;
- }
--    ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
--       [MONOTONIC_CLOCK="cross compiling"])
-+    ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
- 
-     LIBS="$LIBS_SAVE"
-     CPPFLAGS="$CPPFLAGS_SAVE"
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-nohwaccess.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-nohwaccess.patch
deleted file mode 100644
index 18e265be78..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-nohwaccess.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Subject: [PATCH] xorg-server: add the ability to run without root privileges.
-
-Of course we'll need more changes in our startup scripts for this to work.
----
- hw/xfree86/os-support/linux/lnx_init.c  |    7 +++++++
- hw/xfree86/os-support/linux/lnx_video.c |    4 ++++
- 2 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
-index 2176985..70c99b0 100644
---- a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -39,6 +39,7 @@
- #include <sys/stat.h>
- 
- static Bool KeepTty = FALSE;
-+Bool NoHwAccess = FALSE;
- static int activeVT = -1;
- 
- static char vtname[11];
-@@ -314,6 +315,11 @@ xf86ProcessArgument(int argc, char *argv[], int i)
-         return 1;
-     }
- 
-+    if (!strcmp(argv[i], "-nohwaccess"))
-+    {
-+        NoHwAccess = TRUE;
-+        return(1);
-+    }
-     if ((argv[i][0] == 'v') && (argv[i][1] == 't')) {
-         if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0) {
-             UseMsg();
-@@ -331,4 +337,5 @@ xf86UseMsg(void)
-     ErrorF("vtXX                   use the specified VT number\n");
-     ErrorF("-keeptty               ");
-     ErrorF("don't detach controlling tty (for debugging only)\n");
-+    ErrorF("-nohwaccess            don't access hardware ports directly\n");
- }
-diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
-index 0d91f7a..42f42d6 100644
---- a/hw/xfree86/os-support/linux/lnx_video.c
-+++ b/hw/xfree86/os-support/linux/lnx_video.c
-@@ -46,6 +46,7 @@
- #include <asm/mtrr.h>
- #endif
- 
-+extern Bool NoHwAccess;
- static Bool ExtendedEnabled = FALSE;
- 
- #ifdef __ia64__
-@@ -488,6 +489,9 @@ xf86EnableIO(void)
-     int fd;
-     unsigned int ioBase_phys;
- #endif
-+	/* Fake it... */
-+	if (NoHwAccess)
-+		return TRUE;
- 
-     if (ExtendedEnabled)
-         return TRUE;
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-refcnt-glxdrawable.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-refcnt-glxdrawable.patch
deleted file mode 100644
index c337550e4e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-refcnt-glxdrawable.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 37093bb245ccd57b7ed65e71163ea5b65e949521 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 10 Dec 2010 11:30:34 +0000
-Subject: [PATCH] glx: Refcnt the GLXDrawable to avoid use after free with multiple FreeResource
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Although there may be more than one resource handles pointing to the
-Drawable, we only want to destroy it once and only reference the
-resource which may have just been deleted on the first instance.
-
-v2: Apply fixes and combine with another bug fix from Michel Dänzer,
-    https://bugs.freedesktop.org/show_bug.cgi?id=28181
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: Kristian Høgsberg <krh@bitplanet.net>
-Cc: Michel Dänzer <daenzer@vmware.com>
----
- glx/glxcmds.c     |   24 +++++++++++++++---------
- glx/glxdrawable.h |    3 +++
- glx/glxext.c      |   19 ++++++++++---------
- 3 files changed, 28 insertions(+), 18 deletions(-)
-
-diff --git a/glx/glxcmds.c b/glx/glxcmds.c
-index de9c3f0..b3ea784 100644
---- a/glx/glxcmds.c
-+++ b/glx/glxcmds.c
-@@ -507,6 +507,7 @@ __glXGetDrawable(__GLXcontext * glxc, GLXDrawable drawId, ClientPtr client,
-         *error = BadAlloc;
-         return NULL;
-     }
-+    pGlxDraw->refcnt++;
- 
-     return pGlxDraw;
- }
-@@ -1127,8 +1128,10 @@ __glXDrawableInit(__GLXdrawable * drawable,
-     drawable->pDraw = pDraw;
-     drawable->type = type;
-     drawable->drawId = drawId;
-+    drawable->otherId = 0;
-     drawable->config = config;
-     drawable->eventMask = 0;
-+    drawable->refcnt = 0;
- 
-     return GL_TRUE;
- }
-@@ -1158,15 +1161,18 @@ DoCreateGLXDrawable(ClientPtr client, __GLXscreen * pGlxScreen,
-         pGlxDraw->destroy(pGlxDraw);
-         return BadAlloc;
-     }
--
--    /*
--     * Windows aren't refcounted, so track both the X and the GLX window
--     * so we get called regardless of destruction order.
--     */
--    if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW &&
--        !AddResource(pDraw->id, __glXDrawableRes, pGlxDraw)) {
--        pGlxDraw->destroy(pGlxDraw);
--        return BadAlloc;
-+    pGlxDraw->refcnt++;
-+
-+    if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW) {
-+	/* Add the glx drawable under the XID of the underlying X drawable
-+	 * too.  That way we'll get a callback in DrawableGone and can
-+	 * clean up properly when the drawable is destroyed. */
-+	if (!AddResource(drawableId, __glXDrawableRes, pGlxDraw)) {
-+	    pGlxDraw->destroy (pGlxDraw);
-+	    return BadAlloc;
-+	}
-+	pGlxDraw->refcnt++;
-+	pGlxDraw->otherId = drawableId;
-     }
- 
-     return Success;
-diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
-index 2a365c5..80c3234 100644
---- a/glx/glxdrawable.h
-+++ b/glx/glxdrawable.h
-@@ -51,8 +51,11 @@ struct __GLXdrawable {
-     void (*waitX) (__GLXdrawable *);
-     void (*waitGL) (__GLXdrawable *);
- 
-+    int refcnt; /* number of resources handles referencing this */
-+
-     DrawablePtr pDraw;
-     XID drawId;
-+    XID otherId; /* for glx1.3 we need to track the original Drawable as well */
- 
-     /*
-      ** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or
-diff --git a/glx/glxext.c b/glx/glxext.c
-index 4bd5d6b..77db8b0 100644
---- a/glx/glxext.c
-+++ b/glx/glxext.c
-@@ -123,17 +123,18 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid)
- {
-     __GLXcontext *c, *next;
- 
--    if (glxPriv->type == GLX_DRAWABLE_WINDOW) {
--        /* If this was created by glXCreateWindow, free the matching resource */
--        if (glxPriv->drawId != glxPriv->pDraw->id) {
--            if (xid == glxPriv->drawId)
--                FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE);
--            else
--                FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
--        }
--        /* otherwise this window was implicitly created by MakeCurrent */
-+    if (glxPriv->otherId) {
-+	    XID other = glxPriv->otherId;
-+	    glxPriv->otherId = 0;
-+	    if (xid == other)
-+		    FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
-+	    else
-+		    FreeResourceByType(other, __glXDrawableRes, TRUE);
-     }
- 
-+    if (--glxPriv->refcnt)
-+	    return True;
-+
-     for (c = glxAllContexts; c; c = next) {
-         next = c->next;
-         if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-xserver-bg-none-root.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-xserver-bg-none-root.patch
deleted file mode 100644
index 0355d0ba06..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-xserver-bg-none-root.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/dix/window.c b/dix/window.c
-index d293e90..c33514b 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -550,9 +550,13 @@ InitRootWindow(WindowPtr pWin)
-     pWin->optional->cursor = rootCursor;
-     rootCursor->refcnt++;
- 
-+    pWin->backingStore = defaultBackingStore;
-+    pWin->forcedBS = (defaultBackingStore != NotUseful);
-+
-     if (party_like_its_1989) {
-         MakeRootTile(pWin);
-         backFlag |= CWBackPixmap;
-+        (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
-     }
-     else if (pScreen->canDoBGNoneRoot && bgNoneRoot) {
-         pWin->backgroundState = XaceBackgroundNoneState(pWin);
-@@ -560,19 +564,9 @@ InitRootWindow(WindowPtr pWin)
-         backFlag |= CWBackPixmap;
-     }
-     else {
--        pWin->backgroundState = BackgroundPixel;
--        if (whiteRoot)
--            pWin->background.pixel = pScreen->whitePixel;
--        else
--            pWin->background.pixel = pScreen->blackPixel;
--        backFlag |= CWBackPixel;
-+	/* nothing, handled in xf86CreateRootWindow */
-     }
- 
--    pWin->backingStore = defaultBackingStore;
--    pWin->forcedBS = (defaultBackingStore != NotUseful);
--    /* We SHOULD check for an error value here XXX */
--    (*pScreen->ChangeWindowAttributes) (pWin, backFlag);
--
-     MapWindow(pWin, serverClient);
- }
- 
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 5263b5f..eb530bb 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -60,6 +60,7 @@
- #ifdef XFreeXDGA
- #include "dgaproc.h"
- #endif
-+#include "xace.h"
- 
- #define XF86_OS_PRIVS
- #include "xf86.h"
-@@ -308,6 +309,7 @@ xf86CreateRootWindow(WindowPtr pWin)
-     int ret = TRUE;
-     int err = Success;
-     ScreenPtr pScreen = pWin->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-     RootWinPropPtr pProp;
-     CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
-         dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
-@@ -357,6 +359,15 @@ xf86CreateRootWindow(WindowPtr pWin)
-         }
-     }
- 
-+    if (pScrn->canDoBGNoneRoot) {
-+        pWin->backgroundState = XaceBackgroundNoneState(pWin);
-+        pWin->background.pixel = pScreen->whitePixel;
-+        pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore);
-+    } else {
-+        pWin->background.pixel = pScreen->blackPixel;
-+        pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore);
-+    }
-+
-     DebugF("xf86CreateRootWindow() returns %d\n", ret);
-     return ret;
- }
-diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index e2ca558..e1c5331 100644
---- a/hw/xfree86/common/xf86str.h
-+++ b/hw/xfree86/common/xf86str.h
-@@ -497,7 +497,7 @@ typedef struct _confdrirec {
- } confDRIRec, *confDRIPtr;
- 
- /* These values should be adjusted when new fields are added to ScrnInfoRec */
--#define NUM_RESERVED_INTS		16
-+#define NUM_RESERVED_INTS		15
- #define NUM_RESERVED_POINTERS		14
- #define NUM_RESERVED_FUNCS		10
- 
-@@ -758,6 +758,9 @@ typedef struct _ScrnInfoRec {
-     ClockRangePtr clockRanges;
-     int adjustFlags;
- 
-+    /* -nr support */
-+    int                        canDoBGNoneRoot;
-+
-     /*
-      * These can be used when the minor ABI version is incremented.
-      * The NUM_* parameters must be reduced appropriately to keep the
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-add-maxvt-flag.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-add-maxvt-flag.patch
deleted file mode 100644
index df7c4f304f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-add-maxvt-flag.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Yoshiki IGUCHI <yoshiki@chromium.org>
-Date: Mon, 12 Nov 2012 14:21:28 +0800
-Subject: [PATCH] Add the flag to specify the maximum VT number the user
- can switch to.
-
-This CL adds the flag named '-maxvt', which specify the maximum VT
-number the user can switch to with Ctrl-Alt-Fn keys.
-
-BUG=chromium:153961
-TEST=manual
----
- hw/xfree86/common/xf86Events.c |    4 +++-
- os/utils.c                     |   12 ++++++++++++
- 2 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
-index 3ad34b5..cfe92f0 100644
---- a/hw/xfree86/common/xf86Events.c
-+++ b/hw/xfree86/common/xf86Events.c
-@@ -100,6 +100,8 @@ Bool VTSwitchEnabled = TRUE;    /* Allows run-time disabling for
- 
- extern fd_set EnabledDevices;
- 
-+extern int maxVT;
-+
- #ifdef XF86PM
- extern void (*xf86OSPMClose) (void);
- #endif
-@@ -198,7 +200,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
-         if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) {
-             int vtno = *((int *) arg);
- 
--            if (vtno != xf86Info.vtno) {
-+            if ((maxVT < 0 || vtno <= maxVT) && vtno != xf86Info.vtno) {
-                 if (!xf86VTActivate(vtno)) {
-                     ErrorF("Failed to switch from vt%02d to vt%02d: %s\n",
-                            xf86Info.vtno, vtno, strerror(errno));
-diff --git a/os/utils.c b/os/utils.c
-index 04bcbc6..8b19838 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -202,6 +202,8 @@ Bool PanoramiXExtensionDisabledHack = FALSE;
- 
- int auditTrailLevel = 1;
- 
-+int maxVT = -1;
-+
- char *SeatId = NULL;
- 
- #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
-@@ -502,6 +504,7 @@ UseMsg(void)
- #ifdef RLIMIT_STACK
-     ErrorF("-ls int                limit stack space to N Kb\n");
- #endif
-+    ErrorF("-maxvt int             maximum switchable VT, -1 to permit any\n");
-     ErrorF("-nolock                disable the locking mechanism\n");
-     ErrorF("-nolisten string       don't listen on protocol\n");
-     ErrorF("-noreset               don't reset after last client exists\n");
-@@ -734,6 +737,15 @@ ProcessCommandLine(int argc, char *argv[])
-                 UseMsg();
-         }
- #endif
-+        else if (strcmp(argv[i], "-maxvt") == 0) {
-+            if (++i < argc) {
-+                maxVT = atoi(argv[i]);
-+                if (maxVT < 0)
-+                    maxVT = -1;
-+            }
-+            else
-+                UseMsg();
-+        }
-         else if (strcmp(argv[i], "-nolock") == 0) {
- #if !defined(WIN32) && !defined(__CYGWIN__)
-             if (getuid() != 0)
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-dix-don-t-emulate-scroll-events-for-non-existing-axe.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-dix-don-t-emulate-scroll-events-for-non-existing-axe.patch
deleted file mode 100644
index bda376ba8d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-dix-don-t-emulate-scroll-events-for-non-existing-axe.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From af88b43f9e604157b74270d609c08bdfa256a792 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 27 Apr 2012 16:31:17 +1000
-Subject: [PATCH] dix: don't emulate scroll events for non-existing axes
- (#47281)
-
-Test case:
-- create a device with REL_HWHEEL and ABS_X and ABS_Y. evdev 2.7.0 will set
-  that up as device with 1 relative axis
-- move pointer to VGA1
-- xrandr --output VGA1 --off
-
-Warps the pointer to the new spot and calls GPE with the x/y mask bits set.
-When running through the loop to check for scroll event, this overruns the
-axes and may try to emulate scroll events based on random garbage in the
-memory. If that memory contained non-zero for the scroll type but near-zero
-for the increment field, the server would hang in an infinite loop.
-
-This was the trigger for this suggested, never-merged, patch here:
-http://patchwork.freedesktop.org/patch/9543/
-
-X.Org Bug 47281 <http://bugs.freedesktop.org/show_bug.cgi?id=47281>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
- dix/getevents.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 23bbe06..c960d44 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -1577,6 +1577,9 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
-     /* Now turn the smooth-scrolling axes back into emulated button presses
-      * for legacy clients, based on the integer delta between before and now */
-     for (i = 0; i < valuator_mask_size(&mask); i++) {
-+        if (i >= pDev->valuator->numAxes)
-+            break;
-+
-         if (!valuator_mask_isset(&mask, i))
-             continue;
- 
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-do-not-attend-gone-clients.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-do-not-attend-gone-clients.patch
deleted file mode 100644
index 990fd85a44..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-do-not-attend-gone-clients.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: [PATCH] xserver: Fix dri2 race
-
-The is a race where the client disappears after submitting the swapbuffers
-but before completing the request. Don't attend the client if it is gone.
----
- hw/xfree86/dri2/dri2.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
-index 5cc9068..d03d082 100644
---- a/hw/xfree86/dri2/dri2.c
-+++ b/hw/xfree86/dri2/dri2.c
-@@ -220,7 +220,9 @@ DRI2SwapLimit(DrawablePtr pDraw, int swap_limit)
- 
-     if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) {
-         if (pPriv->blockedClient) {
--            AttendClient(pPriv->blockedClient);
-+            if ((pPriv->blockedClient->clientState != ClientStateGone) &&
-+                (pPriv->blockedClient->clientState != ClientStateInitial))
-+                AttendClient(pPriv->blockedClient);
-             pPriv->blockedClient = NULL;
-         }
-     }
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-emulate-partial-flips.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-emulate-partial-flips.patch
deleted file mode 100644
index cb92bc2068..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-emulate-partial-flips.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/glx/glxcmds.c b/glx/glxcmds.c
-index 5cd95f6..de22540 100644
---- a/glx/glxcmds.c
-+++ b/glx/glxcmds.c
-@@ -784,7 +784,7 @@ __glXDisp_WaitGL(__GLXclientState * cl, GLbyte * pc)
-     }
- 
-     if (glxc && glxc->drawPriv->waitGL)
--        (*glxc->drawPriv->waitGL) (glxc->drawPriv);
-+        (*glxc->drawPriv->waitGL) (client, glxc->drawPriv);
- 
-     return Success;
- }
-@@ -811,7 +811,7 @@ __glXDisp_WaitX(__GLXclientState * cl, GLbyte * pc)
-     }
- 
-     if (glxc && glxc->drawPriv->waitX)
--        (*glxc->drawPriv->waitX) (glxc->drawPriv);
-+        (*glxc->drawPriv->waitX) (client, glxc->drawPriv);
- 
-     return Success;
- }
-@@ -1841,7 +1841,7 @@ __glXDisp_CopySubBufferMESA(__GLXclientState * cl, GLbyte * pc)
-         pGlxDraw->copySubBuffer == NULL)
-         return __glXError(GLXBadDrawable);
- 
--    (*pGlxDraw->copySubBuffer) (pGlxDraw, x, y, width, height);
-+    (*pGlxDraw->copySubBuffer) (client, pGlxDraw, x, y, width, height);
- 
-     return Success;
- }
-diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
-index 80c3234..7e71a23 100644
---- a/glx/glxdrawable.h
-+++ b/glx/glxdrawable.h
-@@ -46,10 +46,10 @@ enum {
- struct __GLXdrawable {
-     void (*destroy) (__GLXdrawable * private);
-      GLboolean(*swapBuffers) (ClientPtr client, __GLXdrawable *);
--    void (*copySubBuffer) (__GLXdrawable * drawable,
-+    void (*copySubBuffer) (ClientPtr client, __GLXdrawable * drawable,
-                            int x, int y, int w, int h);
--    void (*waitX) (__GLXdrawable *);
--    void (*waitGL) (__GLXdrawable *);
-+    void (*waitX) (ClientPtr client, __GLXdrawable *);
-+    void (*waitGL) (ClientPtr client, __GLXdrawable *);
- 
-     int refcnt; /* number of resources handles referencing this */
- 
-diff --git a/glx/glxdri.c b/glx/glxdri.c
-index 326f539..3fbf118 100644
---- a/glx/glxdri.c
-+++ b/glx/glxdri.c
-@@ -270,7 +270,7 @@ __glXDRIdrawableSwapInterval(__GLXdrawable * baseDrawable, int interval)
- }
- 
- static void
--__glXDRIdrawableCopySubBuffer(__GLXdrawable * basePrivate,
-+__glXDRIdrawableCopySubBuffer(ClientPtr client, __GLXdrawable * basePrivate,
-                               int x, int y, int w, int h)
- {
-     __GLXDRIdrawable *private = (__GLXDRIdrawable *) basePrivate;
-diff --git a/glx/glxdri2.c b/glx/glxdri2.c
-index 5e524db..ff6145b 100644
---- a/glx/glxdri2.c
-+++ b/glx/glxdri2.c
-@@ -114,10 +114,11 @@ __glXDRIdrawableDestroy(__GLXdrawable * drawable)
- }
- 
- static void
--__glXDRIdrawableCopySubBuffer(__GLXdrawable * drawable,
-+__glXDRIdrawableCopySubBuffer(ClientPtr client, __GLXdrawable * drawable,
-                               int x, int y, int w, int h)
- {
-     __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
-+    __GLXDRIscreen *screen = private->screen;
-     BoxRec box;
-     RegionRec region;
- 
-@@ -127,12 +128,27 @@ __glXDRIdrawableCopySubBuffer(__GLXdrawable * drawable,
-     box.y2 = private->height - y;
-     RegionInit(&region, &box, 0);
- 
--    DRI2CopyRegion(drawable->pDraw, &region,
--                   DRI2BufferFrontLeft, DRI2BufferBackLeft);
-+    LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__);
-+#if __DRI2_FLUSH_VERSION >= 3
-+    LogMessage(X_INFO, "%s:%d flushing\n",__func__,__LINE__);
-+    if (screen->flush) {
-+        LogMessage(X_INFO, "%s:%d flushing2\n",__func__,__LINE__);
-+	(*screen->flush->flush)(private->driDrawable);
-+	(*screen->flush->invalidate)(private->driDrawable);
-+    }
-+#else
-+    LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__);
-+    if (screen->flush)
-+	(*screen->flush->flushInvalidate)(private->driDrawable);
-+#endif
-+
-+    LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__);
-+    DRI2CopyRegion(client, drawable->pDraw, &region,
-+                   DRI2BufferFrontLeft, DRI2BufferBackLeft, TRUE);
- }
- 
- static void
--__glXDRIdrawableWaitX(__GLXdrawable * drawable)
-+__glXDRIdrawableWaitX(ClientPtr client, __GLXdrawable * drawable)
- {
-     __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
-     BoxRec box;
-@@ -144,12 +160,12 @@ __glXDRIdrawableWaitX(__GLXdrawable * drawable)
-     box.y2 = private->height;
-     RegionInit(&region, &box, 0);
- 
--    DRI2CopyRegion(drawable->pDraw, &region,
--                   DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft);
-+    DRI2CopyRegion(client, drawable->pDraw, &region,
-+                   DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft, FALSE);
- }
- 
- static void
--__glXDRIdrawableWaitGL(__GLXdrawable * drawable)
-+__glXDRIdrawableWaitGL(ClientPtr client, __GLXdrawable * drawable)
- {
-     __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
-     BoxRec box;
-@@ -161,8 +177,8 @@ __glXDRIdrawableWaitGL(__GLXdrawable * drawable)
-     box.y2 = private->height;
-     RegionInit(&region, &box, 0);
- 
--    DRI2CopyRegion(drawable->pDraw, &region,
--                   DRI2BufferFrontLeft, DRI2BufferFakeFrontLeft);
-+    DRI2CopyRegion(client, drawable->pDraw, &region,
-+                   DRI2BufferFrontLeft, DRI2BufferFakeFrontLeft, FALSE);
- }
- 
- static void
-@@ -565,7 +581,7 @@ static void
- dri2FlushFrontBuffer(__DRIdrawable * driDrawable, void *loaderPrivate)
- {
-     (void) driDrawable;
--    __glXDRIdrawableWaitGL((__GLXdrawable *) loaderPrivate);
-+    __glXDRIdrawableWaitGL(NULL, (__GLXdrawable *) loaderPrivate);
- }
- 
- static const __DRIdri2LoaderExtension loaderExtension = {
-diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
-index d03d082..28383fb 100644
---- a/hw/xfree86/dri2/dri2.c
-+++ b/hw/xfree86/dri2/dri2.c
-@@ -87,6 +87,7 @@ typedef struct _DRI2Drawable {
-     int swap_limit;             /* for N-buffering */
-     unsigned long serialNumber;
-     Bool needInvalidate;
-+    RegionPtr previous_region;
- } DRI2DrawableRec, *DRI2DrawablePtr;
- 
- typedef struct _DRI2Screen {
-@@ -175,6 +176,7 @@ DRI2AllocateDrawable(DrawablePtr pDraw)
-     pPriv->swap_count = 0;
-     pPriv->target_sbc = -1;
-     pPriv->swap_interval = 1;
-+    pPriv->previous_region = NULL;
-     /* Initialize last swap target from DDX if possible */
-     if (!ds->GetMSC || !(*ds->GetMSC) (pDraw, &ust, &pPriv->last_swap_target))
-         pPriv->last_swap_target = 0;
-@@ -552,8 +554,8 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
-         box.y2 = pPriv->height;
-         RegionInit(&region, &box, 0);
- 
--        DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,
--                       DRI2BufferFrontLeft);
-+        DRI2CopyRegion(NULL, pDraw, &region, DRI2BufferFakeFrontLeft,
-+                       DRI2BufferFrontLeft, FALSE);
-     }
- 
-     pPriv->needInvalidate = TRUE;
-@@ -661,9 +663,118 @@ DRI2BlockClient(ClientPtr client, DrawablePtr pDraw)
-     pPriv->blockedOnMsc = TRUE;
- }
- 
-+static Bool DRI2CopyRegionWithFlip(ClientPtr client, DrawablePtr pDraw,
-+				   RegionPtr pRegion,
-+				   DRI2BufferPtr pDestBuffer,
-+				   DRI2BufferPtr pSrcBuffer)
-+{
-+    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
-+    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
-+    ScreenPtr pScreen = pPriv->dri2_screen->screen;
-+    RegionPtr pPreviousRegion;
-+    RegionPtr pCopyFrontToBack;
-+    int ret;
-+    DRI2SwapEventPtr func = NULL;
-+    void *data = NULL;
-+    PixmapPtr pWindowPix, pScreenPix;
-+    CARD64 target_msc = 0, divisor = 0, remainder = 0;
-+    CARD64 ust, current_msc;
-+    CARD64 swap_target;
-+
-+    /* Make sure we have a window */
-+    if (pDraw->type != DRAWABLE_WINDOW)
-+        return FALSE;
-+
-+    /* Ensure that our window is the screen pixmap */
-+    pWindowPix = pScreen->GetWindowPixmap((WindowPtr)pDraw);
-+    pScreenPix = pScreen->GetScreenPixmap(pScreen);
-+    if (pWindowPix != pScreenPix)
-+        return FALSE;
-+
-+    /* Create a region pCopyFrontToBack which brings over the changes from
-+     * the last frame. Do this by subtracting the current region from the
-+     * previous updates and copying the resulting bits. In the case where we
-+     * don't have a previous region we'll update the whole drawable */
-+    pCopyFrontToBack = REGION_CREATE(pScreen, NULL, 0);
-+
-+    if (pPriv->previous_region) {
-+        pPreviousRegion = pPriv->previous_region;
-+    } else {
-+        BoxRec box;
-+        box.x1 = pDraw->x;
-+        box.y1 = pDraw->y;
-+        box.x2 = box.x1 + pDraw->width;
-+        box.y2 = box.y1 + pDraw->height;
-+        pPreviousRegion = REGION_CREATE(pScreen, &box, 1);
-+    }
-+
-+    REGION_SUBTRACT(pScreen, pCopyFrontToBack, pPreviousRegion, pRegion);
-+    REGION_DESTROY(pScreen, pPreviousRegion);
-+    (*ds->CopyRegion)(pDraw, pCopyFrontToBack, pSrcBuffer, pDestBuffer);
-+
-+    /*
-+     * In the simple glXSwapBuffers case, all params will be 0, and we just
-+     * need to schedule a swap for the last swap target + the swap interval.
-+     */
-+    if (target_msc == 0 && divisor == 0 && remainder == 0) {
-+        /* If the current vblank count of the drawable's crtc is lower
-+         * than the count stored in last_swap_target from a previous swap
-+         * then reinitialize last_swap_target to the current crtc's msc,
-+         * otherwise the swap will hang. This will happen if the drawable
-+         * is moved to a crtc with a lower refresh rate, or a crtc that just
-+         * got enabled.
-+         */
-+        if (ds->GetMSC) {
-+            if (!(*ds->GetMSC)(pDraw, &ust, &current_msc))
-+		pPriv->last_swap_target = 0;
-+
-+            if (current_msc < pPriv->last_swap_target)
-+		pPriv->last_swap_target = current_msc;
-+
-+        }
-+
-+        /*
-+         * Swap target for this swap is last swap target + swap interval since
-+         * we have to account for the current swap count, interval, and the
-+         * number of pending swaps.
-+         */
-+        swap_target = pPriv->last_swap_target + pPriv->swap_interval;
-+
-+    } else {
-+        /* glXSwapBuffersMscOML could have a 0 target_msc, honor it */
-+        swap_target = target_msc;
-+    }
-+
-+    if (pPriv->swapsPending > 0)
-+        return FALSE;
-+
-+    pPriv->swapsPending++;
-+    ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer,
-+		      &swap_target, divisor, remainder, func, data);
-+    if (!ret) {
-+        pPriv->swapsPending--; /* didn't schedule */
-+        return FALSE;
-+    }
-+
-+    pPriv->last_swap_target = swap_target;
-+
-+    /* According to spec, return expected swapbuffers count SBC after this swap
-+     * will complete.
-+     */
-+    swap_target = pPriv->swap_count + pPriv->swapsPending;
-+
-+    DRI2InvalidateDrawable(pDraw);
-+
-+    pPriv->previous_region = REGION_CREATE(pScreen, NULL, 0);
-+    REGION_COPY(pScreen, pPriv->previous_region, pRegion);
-+
-+    REGION_DESTROY(pScreen, pCopyFrontToBack);
-+    return TRUE;
-+}
-+
- int
--DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
--               unsigned int dest, unsigned int src)
-+DRI2CopyRegion(ClientPtr client, DrawablePtr pDraw, RegionPtr pRegion,
-+               unsigned int dest, unsigned int src, Bool invalidate)
- {
-     DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
-     DRI2DrawablePtr pPriv;
-@@ -685,8 +796,13 @@ DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
-     if (pSrcBuffer == NULL || pDestBuffer == NULL)
-         return BadValue;
- 
--    (*ds->CopyRegion) (pDraw, pRegion, pDestBuffer, pSrcBuffer);
-+    if (invalidate &&
-+        DRI2CopyRegionWithFlip(client, pDraw, pRegion,
-+                               pDestBuffer, pSrcBuffer))
-+        return Success;
- 
-+    pPriv->previous_region = NULL;
-+    (*ds->CopyRegion)(pDraw, pRegion, pDestBuffer, pSrcBuffer);
-     return Success;
- }
- 
-@@ -814,8 +930,8 @@ DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame,
-     box.x2 = pDraw->width;
-     box.y2 = pDraw->height;
-     RegionInit(&region, &box, 0);
--    DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,
--                   DRI2BufferFrontLeft);
-+    DRI2CopyRegion(client, pDraw, &region, DRI2BufferFakeFrontLeft,
-+                   DRI2BufferFrontLeft, FALSE);
- 
-     ust = ((CARD64) tv_sec * 1000000) + tv_usec;
-     if (swap_complete)
-@@ -889,6 +1005,8 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
-         return BadDrawable;
-     }
- 
-+    pPriv->previous_region = NULL;
-+
-     /* Old DDX or no swap interval, just blit */
-     if (!ds->ScheduleSwap || !pPriv->swap_interval) {
-         BoxRec box;
-@@ -1345,3 +1463,4 @@ DRI2Version(int *major, int *minor)
-     if (minor != NULL)
-         *minor = DRI2VersRec.minorversion;
- }
-+
-diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h
-index a67e35f..e30fb7a 100644
---- a/hw/xfree86/dri2/dri2.h
-+++ b/hw/xfree86/dri2/dri2.h
-@@ -248,9 +248,11 @@ extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffers(DrawablePtr pDraw,
-                                                unsigned int *attachments,
-                                                int count, int *out_count);
- 
--extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw,
-+extern _X_EXPORT int DRI2CopyRegion(ClientPtr client,
-+                                    DrawablePtr pDraw,
-                                     RegionPtr pRegion,
--                                    unsigned int dest, unsigned int src);
-+                                    unsigned int dest, unsigned int src,
-+                                    Bool invalidate);
- 
- /**
-  * Determine the major and minor version of the DRI2 extension.
-diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
-index 73ef7f2..dfa242a 100644
---- a/hw/xfree86/dri2/dri2ext.c
-+++ b/hw/xfree86/dri2/dri2ext.c
-@@ -319,7 +319,7 @@ ProcDRI2CopyRegion(ClientPtr client)
- 
-     VERIFY_REGION(pRegion, stuff->region, client, DixReadAccess);
- 
--    status = DRI2CopyRegion(pDrawable, pRegion, stuff->dest, stuff->src);
-+    status = DRI2CopyRegion(client, pDrawable, pRegion, stuff->dest, stuff->src, TRUE);
-     if (status != Success)
-         return status;
- 
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch
deleted file mode 100644
index 00a978422d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 758de0b68be0b2ace903d3c86fca65865f34d7cd Mon Sep 17 00:00:00 2001
-From: Yufeng Shen <miletus@chromium.org>
-Date: Fri, 20 Jul 2012 18:58:10 -0400
-Subject: [PATCH] x11-base/xorg-server: fix scale_to_desktop for edge ABS
- events
-
-Scale_to_desktop() converts ABS events from device coordinates
-to screen coordinates:
-[dev_X_min, dev_X_max]  -> [screen_X_min, screen_X_max]
-[dev_Y_min, dev_Y_max]  -> [screen_Y_min, screen_Y_max]
-
-An edge ABS event with X = dev_X_max (e.g., generated from the
-edge of a touchscreen) will be converted to have screen X value
-= screen_X_max, which, however, will be filterd out when xserver
-tries to find proper Window to receive the event, because the
-range check for a Window to receive events is
-       window_X_min <= event_screen_X < window_X_max
-Events with event_screen_X = screen_X_max will fail the test get
-and rejected by the Window.
-
-To fix this, we change the device to screen coordinates mapping to
-[dev_X_min, dev_X_max]  -> [screen_X_min, screen_X_max-1]
-[dev_Y_min, dev_Y_max]  -> [screen_Y_min, screen_Y_max-1]
-
-Signed-off-by: Yufeng Shen <miletus@chromium.org>
----
- dix/getevents.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index b78d5ce..9898c6a 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -890,9 +890,9 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
- 
-     /* scale x&y to desktop coordinates */
-     *screenx = rescaleValuatorAxis(x, dev->valuator->axes + 0, NULL,
--                                   screenInfo.x, screenInfo.width);
-+                                   screenInfo.x, screenInfo.width - 1);
-     *screeny = rescaleValuatorAxis(y, dev->valuator->axes + 1, NULL,
--                                   screenInfo.y, screenInfo.height);
-+                                   screenInfo.y, screenInfo.height - 1);
- 
-     *devx = x;
-     *devy = y;
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch
deleted file mode 100644
index cfe03a43cf..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d53e6e02a2595ced1882f5fcd34d08ea039b3b85 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 16 Aug 2012 13:54:42 +1000
-Subject: [PATCH] mi: don't check for core events in miPointerSetPosition
- (#53568)
-
-As of 81cfe44b1ed0de84ad1941fe2ca74bebef3fc58d, miPointerSetPosition now
-returns the screen pointer of the device. This broke floating slave devices,
-as soon as a motion event was submitted, miPointerSetPosition returned NULL,
-crashing the server.
-
-dev->coreEvents is only false if the device is a floating slave, in which
-case it has a sprite.
-
-X.Org Bug 53568 <http://bugs.freedesktop.org/show_bug.cgi?id=53568>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Keith Packard <keithp@keithp.com>
----
- mi/mipointer.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mi/mipointer.c b/mi/mipointer.c
-index a56838e..4defaf5 100644
---- a/mi/mipointer.c
-+++ b/mi/mipointer.c
-@@ -575,7 +575,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx,
- 
-     miPointerPtr pPointer;
- 
--    if (!pDev || !pDev->coreEvents)
-+    if (!pDev)
-         return NULL;
- 
-     pPointer = MIPOINTER(pDev);
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-block-signals-when-accessing-global-timer-list.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-block-signals-when-accessing-global-timer-list.patch
deleted file mode 100644
index 9f04b259cc..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-block-signals-when-accessing-global-timer-list.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From: Daniel Kurtz <djkurtz@chromium.org>
-Date: Sat, 22 Sep 2012 19:58:22 +0800
-Subject: [PATCH] os: block signals when accessing global timer list
-
-X Input drivers, such as xf86-input-synaptics, tend to do all of their
-processing in a SIGIO signal handler.  This processing often involves
-creating, modifying or canceling a timer.  Any of these operations may
-modify the global "timers" array.  Therefore, all accesses of this global
-must be done in critical sections during which signals are blocked.
-
-Otherwise, for example, a signal may clear the last timer between, which
-sets timers global to NULL, between the NULL check and checking "expires",
-which causes a SEGV.
-
-A previous patch protected write accesses.  However, this is not
-sufficient. ead accesses must also be made atomic such that a signal
-cannot occur between the timers pointer NULL check and a subsequent
-dereference.
-
-This change actually makes the Signal blocking in DoTimer() and
-CheckAllTimers() redundant, since they are always called with signals
-already blocked.
-
-Also, make the global volatile to ensure that the compiler does not
-cache its value.
-
-Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
----
- os/WaitFor.c |   27 +++++++++++++++++++--------
- 1 files changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/os/WaitFor.c b/os/WaitFor.c
-index 852362e..f105acc 100644
---- a/os/WaitFor.c
-+++ b/os/WaitFor.c
-@@ -122,7 +122,7 @@ struct _OsTimerRec {
- 
- static void DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev);
- static void CheckAllTimers(void);
--static OsTimerPtr timers = NULL;
-+volatile static OsTimerPtr timers = NULL;
- 
- /*****************
-  * WaitForSomething:
-@@ -186,6 +186,7 @@ WaitForSomething(int *pClientsReady)
-         }
-         else {
-             wt = NULL;
-+            OsBlockSignals();
-             if (timers) {
-                 now = GetTimeInMillis();
-                 timeout = timers->expires - now;
-@@ -204,6 +205,7 @@ WaitForSomething(int *pClientsReady)
-                     wt = &waittime;
-                 }
-             }
-+            OsReleaseSignals();
-             XFD_COPYSET(&AllSockets, &LastSelectMask);
-         }
- 
-@@ -251,6 +253,7 @@ WaitForSomething(int *pClientsReady)
-             if (*checkForInput[0] != *checkForInput[1])
-                 return 0;
- 
-+            OsBlockSignals();
-             if (timers) {
-                 int expired = 0;
- 
-@@ -261,14 +264,18 @@ WaitForSomething(int *pClientsReady)
-                 while (timers && (int) (timers->expires - now) <= 0)
-                     DoTimer(timers, now, &timers);
- 
--                if (expired)
-+                if (expired) {
-+                    OsReleaseSignals();
-                     return 0;
-+                }
-             }
-+            OsReleaseSignals();
-         }
-         else {
-             fd_set tmp_set;
- 
-             if (*checkForInput[0] == *checkForInput[1]) {
-+                OsBlockSignals();
-                 if (timers) {
-                     int expired = 0;
- 
-@@ -279,9 +286,12 @@ WaitForSomething(int *pClientsReady)
-                     while (timers && (int) (timers->expires - now) <= 0)
-                         DoTimer(timers, now, &timers);
- 
--                    if (expired)
-+                    if (expired) {
-+                        OsReleaseSignals();
-                         return 0;
-+                    }
-                 }
-+                OsReleaseSignals();
-             }
-             if (someReady)
-                 XFD_ORSET(&LastSelectMask, &ClientsWithInput, &LastSelectMask);
-@@ -382,7 +392,6 @@ CheckAllTimers(void)
-     OsTimerPtr timer;
-     CARD32 now;
- 
--    OsBlockSignals();
-  start:
-     now = GetTimeInMillis();
- 
-@@ -392,7 +401,6 @@ CheckAllTimers(void)
-             goto start;
-         }
-     }
--    OsReleaseSignals();
- }
- 
- static void
-@@ -400,13 +408,11 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev)
- {
-     CARD32 newTime;
- 
--    OsBlockSignals();
-     *prev = timer->next;
-     timer->next = NULL;
-     newTime = (*timer->callback) (timer, now, timer->arg);
-     if (newTime)
-         TimerSet(timer, 0, newTime, timer->callback, timer->arg);
--    OsReleaseSignals();
- }
- 
- OsTimerPtr
-@@ -508,10 +514,13 @@ TimerFree(OsTimerPtr timer)
- void
- TimerCheck(void)
- {
--    CARD32 now = GetTimeInMillis();
-+    CARD32 now;
- 
-+    OsBlockSignals();
-+    now = GetTimeInMillis();
-     while (timers && (int) (timers->expires - now) <= 0)
-         DoTimer(timers, now, &timers);
-+    OsReleaseSignals();
- }
- 
- void
-@@ -519,10 +528,12 @@ TimerInit(void)
- {
-     OsTimerPtr timer;
- 
-+    OsBlockSignals();
-     while ((timer = timers)) {
-         timers = timer->next;
-         free(timer);
-     }
-+    OsReleaseSignals();
- }
- 
- #ifdef DPMSExtension
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-make-timers-signal-safe.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-make-timers-signal-safe.patch
deleted file mode 100644
index 109b226e95..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-make-timers-signal-safe.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 2011e215a101ce928f81baae4ffa9d9ae817ce33 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 27 Apr 2012 08:52:39 +0800
-Subject: [PATCH] os: make timers signal-safe
-
-If TimerSet() is called from a signal handler (synaptics tap handling code)
-may result in list corruption if we're currently inside TimerSet().
-
-See backtrace in
-https://bugzilla.redhat.com/show_bug.cgi?id=814869
-
-Block signals for all list manipulations in the timers.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-(cherry picked from commit 08962951de969b9d8c870af8b6e47303dc0decfd)
-
-Conflicts:
-
-	os/WaitFor.c
----
- os/WaitFor.c |   18 ++++++++++++++++--
- 1 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/os/WaitFor.c b/os/WaitFor.c
-index 867cb04..236406e 100644
---- a/os/WaitFor.c
-+++ b/os/WaitFor.c
-@@ -405,6 +405,7 @@ CheckAllTimers(void)
-     OsTimerPtr timer;
-     CARD32 now;
- 
-+    OsBlockSignals();
- start:
-     now = GetTimeInMillis();
- 
-@@ -414,6 +415,7 @@ start:
-             goto start;
-         }
-     }
-+    OsReleaseSignals();
- }
- 
- static void
-@@ -421,11 +423,13 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev)
- {
-     CARD32 newTime;
- 
-+    OsBlockSignals();
-     *prev = timer->next;
-     timer->next = NULL;
-     newTime = (*timer->callback)(timer, now, timer->arg);
-     if (newTime)
- 	TimerSet(timer, 0, newTime, timer->callback, timer->arg);
-+    OsReleaseSignals();
- }
- 
- OsTimerPtr
-@@ -443,6 +447,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
-     }
-     else
-     {
-+        OsBlockSignals();
- 	for (prev = &timers; *prev; prev = &(*prev)->next)
- 	{
- 	    if (*prev == timer)
-@@ -453,6 +458,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
- 		break;
- 	    }
- 	}
-+        OsReleaseSignals();
-     }
-     if (!millis)
- 	return timer;
-@@ -473,29 +479,35 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
- 	if (!millis)
- 	    return timer;
-     }
-+    OsBlockSignals();
-     for (prev = &timers;
- 	 *prev && (int) ((*prev)->expires - millis) <= 0;
- 	 prev = &(*prev)->next)
-         ;
-     timer->next = *prev;
-     *prev = timer;
-+    OsReleaseSignals();
-     return timer;
- }
- 
- Bool
- TimerForce(OsTimerPtr timer)
- {
-+    int rc = FALSE;
-     OsTimerPtr *prev;
- 
-+    OsBlockSignals();
-     for (prev = &timers; *prev; prev = &(*prev)->next)
-     {
- 	if (*prev == timer)
- 	{
- 	    DoTimer(timer, GetTimeInMillis(), prev);
--	    return TRUE;
-+	    rc = TRUE;
-+	    break;
- 	}
-     }
--    return FALSE;
-+    OsReleaseSignals();
-+    return rc;
- }
- 
- 
-@@ -506,6 +518,7 @@ TimerCancel(OsTimerPtr timer)
- 
-     if (!timer)
- 	return;
-+    OsBlockSignals();
-     for (prev = &timers; *prev; prev = &(*prev)->next)
-     {
- 	if (*prev == timer)
-@@ -514,6 +527,7 @@ TimerCancel(OsTimerPtr timer)
- 	    break;
- 	}
-     }
-+    OsReleaseSignals();
- }
- 
- void
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-suffix-match-udev-paths.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-suffix-match-udev-paths.patch
deleted file mode 100644
index 1752b78577..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-suffix-match-udev-paths.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From d09984016e41b602885e25b17582a0f563384e16 Mon Sep 17 00:00:00 2001
-From: Andrew de los Reyes <adlr@chromium.org>
-Date: Tue, 28 Aug 2012 14:33:45 -0700
-Subject: [PATCH] config/config.c: Workaround for handling udev REMOVED
- messages.
-
-Details at http://code.google.com/p/chromium-os/issues/detail?id=33813 .
-
-The result of the bug is that sometimes a path will have the non-/sys part
-of the prefix missing. For example,
-'/sys/devices/pci0000:00/0000:00:1d.3/usb5/5-1/5-1:1.0/bluetooth/hci0/hci0:21/input32'
-may come in as '/sys/hci0/hci0:21/input32'. This CL will look at the
-suffixes to determine if there is a match.
-
-BUG=chromium-os:33813
-TEST=Reproduced error on ZGB. Saw log message appear and mouse
-function.
----
- config/config.c |   39 +++++++++++++++++++++++++++++++++++++--
- 1 files changed, 37 insertions(+), 2 deletions(-)
-
-diff --git a/config/config.c b/config/config.c
-index 0dae3ad..636abb8 100644
---- a/config/config.c
-+++ b/config/config.c
-@@ -90,6 +90,41 @@ remove_device(const char *backend, DeviceIntPtr dev)
-     OsReleaseSignals();
- }
- 
-+/**
-+ * This is a workaround for
-+ * http://code.google.com/p/chromium-os/issues/detail?id=33813 .
-+ * We strip a prefix from the two strings we get, and if input_dev
-+ * is a suffix of existing_dev, we consider it a match.
-+ */
-+static Bool
-+dev_same_suffix(const char* existing_dev, const char* input_dev)
-+{
-+    const char PREFIX[] = "udev:/sys/";
-+    const size_t PREFIX_LEN = strlen(PREFIX);
-+    size_t existing_len, input_len;
-+
-+    if (strcmp(existing_dev, input_dev) == 0)
-+        return TRUE;
-+    /* If either doesn't have the magic prefix, abort */
-+    if (strncmp(existing_dev, PREFIX, PREFIX_LEN) != 0 ||
-+        strncmp(input_dev, PREFIX, PREFIX_LEN) != 0)
-+        return FALSE;
-+    existing_dev += PREFIX_LEN;
-+    input_dev += PREFIX_LEN;
-+    /* If input_dev is the suffix of existing_dev, return TRUE, else FALSE. */
-+    existing_len = strlen(existing_dev);
-+    input_len = strlen(input_dev);
-+    if (input_len > existing_len)
-+        return FALSE;
-+    if (strcmp(existing_dev + existing_len - input_len, input_dev) == 0) {
-+        LogMessage(X_INFO,
-+                   "devices_same_suffix: matching %s with existing device %s\n",
-+                   input_dev, existing_dev);
-+        return TRUE;
-+    }
-+    return FALSE;
-+}
-+
- void
- remove_devices(const char *backend, const char *config_info)
- {
-@@ -97,12 +132,12 @@ remove_devices(const char *backend, const char *config_info)
- 
-     for (dev = inputInfo.devices; dev; dev = next) {
-         next = dev->next;
--        if (dev->config_info && strcmp(dev->config_info, config_info) == 0)
-+        if (dev->config_info && dev_same_suffix(dev->config_info, config_info))
-             remove_device(backend, dev);
-     }
-     for (dev = inputInfo.off_devices; dev; dev = next) {
-         next = dev->next;
--        if (dev->config_info && strcmp(dev->config_info, config_info) == 0)
-+        if (dev->config_info && dev_same_suffix(dev->config_info, config_info))
-             remove_device(backend, dev);
-     }
- }
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-xfixes-safer-barriers.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-xfixes-safer-barriers.patch
deleted file mode 100644
index a6d8871d8f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-xfixes-safer-barriers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5b8cafec54186ffc038874102e53419c2339130b Mon Sep 17 00:00:00 2001
-From: Chris Wolfe <cwolfe@chromium.org>
-Date: Mon, 23 Jul 2012 15:54:47 -0400
-Subject: [PATCH] fixes: Prevent the cursor from leaking at corners
-
-This is a quick fix to prevent the cursor from leaking through between
-xfixes boundaries at corners. Previously the barrier_is_blocking_direction
-would consider e.g. a +X barrier to block -Y movement, so the second check
-in CursorConstrainCursorHarder would repeat the same barrier in some
-configurations.
----
- xfixes/cursor.c |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/xfixes/cursor.c b/xfixes/cursor.c
-index 7c46269..b9d5c4b 100644
---- a/xfixes/cursor.c
-+++ b/xfixes/cursor.c
-@@ -1055,7 +1055,15 @@ barrier_is_blocking_direction(const struct PointerBarrier * barrier,
-                               int direction)
- {
-     /* Barriers define which way is ok, not which way is blocking */
--    return (barrier->directions & direction) != direction;
-+    int blocks;
-+    if (barrier_is_vertical(barrier)) {
-+	blocks = BarrierNegativeX | BarrierPositiveX;
-+    } else {
-+	blocks = BarrierNegativeY | BarrierPositiveY;
-+    }
-+    blocks &= ~barrier->directions;
-+
-+    return (blocks & direction) != 0;
- }
- 
- /**
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.4-Per-Randr-CRTC-pointer-scaling.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.4-Per-Randr-CRTC-pointer-scaling.patch
deleted file mode 100644
index cc334c4d1e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.4-Per-Randr-CRTC-pointer-scaling.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 5dfb771f6e690b0a2f558f1b2c9d0787bc885587 Mon Sep 17 00:00:00 2001
-From: Daniel Kurtz <djkurtz@chromium.org>
-Date: Mon, 12 Nov 2012 14:39:33 +0800
-Subject: [PATCH] Per Randr CRTC pointer scaling
-
-Scale pointer motion based on the pixel density of the current "RandR" crtc
-and whether or not it's internal.
-
-This implementation is very hacky since it directly accesses XRandR methods
-and datastructures from within the X server proper.  I'm not sure what
-the proper way to solve this is.
-
-BUG=chromium-os:30822
-TEST=Tested on Link, Lucas w/ external display that pointer scaled
-properly in each.
----
- dix/getevents.c |  114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 114 insertions(+), 0 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 7454cb4..5f00584 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -51,6 +51,7 @@
- #include "inpututils.h"
- #include "mi.h"
- #include "windowstr.h"
-+#include "randrstr.h"
- 
- #include <X11/extensions/XKBproto.h>
- #include "xkbsrv.h"
-@@ -72,6 +73,8 @@
- /* Number of motion history events to store. */
- #define MOTION_HISTORY_SIZE 256
- 
-+#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
-+
- /**
-  * InputEventList is the storage for input events generated by
-  * QueuePointerEvents, QueueKeyboardEvents, and QueueProximityEvents.
-@@ -1262,6 +1265,115 @@ QueuePointerEvents(DeviceIntPtr device, int type,
-     queueEventList(device, InputEventList, nevents);
- }
- 
-+/*
-+ * Return TRUE if (x, y) is within the bounds of the given X RandR CRTC.
-+ * If so, it also returns whether the display is high DPI and/or internal.
-+ */
-+static Bool
-+RRCrtcContainsPosition(RRCrtcPtr crtc, int x, int y,
-+                       int *isHighDPI, int *isInternal)
-+{
-+    int i;
-+    int width, height;
-+    const float maxLowDPmm = 160.0 / 25.4;  /* 160 DPI / 25.4 mm/inch */
-+    const char * const integratedPrefixes[] = { "LVDS", "eDP" };
-+
-+    if (!crtc->mode)
-+        return FALSE;
-+
-+    RRCrtcGetScanoutSize(crtc, &width, &height);
-+
-+    if (crtc->x <= x && x < crtc->x + width &&
-+        crtc->y <= y && y < crtc->y + height) {
-+        /* Use the first output for extra return values */
-+        if (crtc->numOutputs) {
-+            RROutputPtr output = crtc->outputs[0];
-+            /* Only consider HighDPI if the output has a mmWidth. */
-+            *isHighDPI = output->mmWidth &&
-+                width > maxLowDPmm * output->mmWidth;
-+            *isInternal = FALSE;
-+            for (i = 0; i < ARRAY_SIZE(integratedPrefixes); i++) {
-+                if (!strncmp(integratedPrefixes[i], output->name,
-+                             strlen(integratedPrefixes[i]))) {
-+                    *isInternal = TRUE;
-+                    break;
-+                }
-+            }
-+        }
-+        return TRUE;
-+    }
-+    return FALSE;
-+}
-+
-+/*
-+ * Find the X RandR CRTC (ie display) which contains desktop coordinate (x,y),
-+ * and return whether it's high DPI and/or internal.
-+ *
-+ * Returns FALSE if (x, y) is not on any known X RandR CRTC.
-+ */
-+static Bool
-+RRGetContainingCrtcInfo(ScreenPtr pScreen, int x, int y,
-+                        int *isHighDPI, int *isInternal)
-+{
-+    rrScrPrivPtr rrScrPriv = rrGetScrPriv(pScreen);
-+    RRCrtcPtr crtc = rrScrPriv->pointerCrtc;
-+    int i;
-+
-+    /* Check last known CRTC */
-+    if (crtc && RRCrtcContainsPosition(crtc, x, y, isHighDPI, isInternal)) {
-+        return TRUE;
-+    }
-+
-+    /* Check all CRTCs */
-+    for (i = 0; i < rrScrPriv->numCrtcs; i++) {
-+        crtc = rrScrPriv->crtcs[i];
-+        if (RRCrtcContainsPosition(crtc, x, y, isHighDPI, isInternal)) {
-+            rrScrPriv->pointerCrtc = crtc;
-+            return TRUE;
-+        }
-+    }
-+    return FALSE;
-+}
-+
-+/*
-+ * Scale the motion vector in mask valuators 0 & 1
-+ *
-+ * Find the RandR CRTC for the current pointer position for this device, and
-+ * use its pixel density and whether or not it's integrated to scale pointer
-+ * motion. Specifically: double all motion on High-DPI displays, add 20% more
-+ * motion on non-integrated displays.
-+ */
-+static void
-+scaleMotionPerRRCrtc(DeviceIntPtr dev, ValuatorMask *mask)
-+{
-+    ScreenPtr pScreen = miPointerGetScreen(dev);
-+    double x, y, dx, dy, scale;
-+    int isHighDPI = FALSE;
-+    int isInternal = FALSE;
-+
-+    x = dev->last.valuators[0];
-+    y = dev->last.valuators[1];
-+
-+    /* Find Size of RandR CRTC containing the current pointer (x, y) */
-+    if (!RRGetContainingCrtcInfo(pScreen, x, y, &isHighDPI, &isInternal))
-+        return;
-+
-+    scale = 1.0;
-+    if (isHighDPI)
-+        scale *= 2.0;
-+    if (!isInternal)
-+        scale *= 1.2;
-+
-+    if (scale != 1.0) {
-+        if (valuator_mask_fetch_double(mask, 0, &dx))
-+            valuator_mask_set_double(mask, 0, dx * scale);
-+
-+        if (valuator_mask_fetch_double(mask, 1, &dy))
-+            valuator_mask_set_double(mask, 1, dy * scale);
-+    }
-+}
-+
-+
- /**
-  * Helper function for GetPointerEvents, which only generates motion and
-  * raw motion events for the slave device: does not update the master device.
-@@ -1368,6 +1480,8 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
-         if ((flags & POINTER_NORAW) == 0)
-             set_raw_valuators(raw, &mask, raw->valuators.data);
- 
-+        scaleMotionPerRRCrtc(pDev, &mask);
-+
-         moveRelative(pDev, &mask);
-     }
- 
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch
deleted file mode 100644
index c7e25cacda..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From e2e273e135bcdadde22c48cf2d70cbd22f268120 Mon Sep 17 00:00:00 2001
-From: Yuly Novikov <ynovikov@chromium.org>
-Date: Mon, 19 Nov 2012 21:04:57 -0500
-Subject: [PATCH] dix: Save touchpoint last coordinates before transform.
- #49347
-
-DDXTouchPointInfoRec.valuators used to store axis values after transform.
-This resulted in Coordinate Transformation Matrix
-being applied multiple times to the last coordinates,
-in the case when only pressure changes in the last touch event.
-
-Changed DDXTouchPointInfoRec.valuators to store values before transform.
-
-Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=49347
-
-BUG=chromium-os:36115
-TEST=Follow the expected output in the bug desription.
-
-Signed-off-by: Yuly Novikov <ynovikov@chromium.org>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit 3b9f1c701787965246638c1a6fd99fb2b6078114)
-
-Conflicts:
-
-	dix/getevents.c
----
- dix/getevents.c    |   22 +++++++++-------------
- include/inputstr.h |    2 +-
- 2 files changed, 10 insertions(+), 14 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 7454cb4..f1e7491 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -1895,32 +1895,28 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
-     default:
-         return 0;
-     }
--    if (t->mode == XIDirectTouch && !(flags & TOUCH_CLIENT_ID)) {
--        if (!valuator_mask_isset(&mask, 0))
--            valuator_mask_set_double(&mask, 0,
--                                     valuator_mask_get_double(touchpoint.ti->
--                                                              valuators, 0));
--        if (!valuator_mask_isset(&mask, 1))
--            valuator_mask_set_double(&mask, 1,
--                                     valuator_mask_get_double(touchpoint.ti->
--                                                              valuators, 1));
--    }
- 
-     /* Get our screen event co-ordinates (root_x/root_y/event_x/event_y):
-      * these come from the touchpoint in Absolute mode, or the sprite in
-      * Relative. */
-     if (t->mode == XIDirectTouch) {
--        transformAbsolute(dev, &mask);
--
-         if (!(flags & TOUCH_CLIENT_ID)) {
--            for (i = 0; i < valuator_mask_size(&mask); i++) {
-+            for (i = 0; i < max(valuator_mask_size(&mask), 2); i++) {
-                 double val;
- 
-                 if (valuator_mask_fetch_double(&mask, i, &val))
-                     valuator_mask_set_double(touchpoint.ti->valuators, i, val);
-+                /* If the device doesn't post new X and Y axis values,
-+                 * use the last values posted.
-+                 */
-+                else if (i < 2 &&
-+                    valuator_mask_fetch_double(touchpoint.ti->valuators, i,
-+                                               &val))
-+                    valuator_mask_set_double(&mask, i, val);
-             }
-         }
- 
-+        transformAbsolute(dev, &mask);
-         clipAbsolute(dev, &mask);
-     }
-     else {
-diff --git a/include/inputstr.h b/include/inputstr.h
-index 841e805..bce46cb 100644
---- a/include/inputstr.h
-+++ b/include/inputstr.h
-@@ -331,7 +331,7 @@ typedef struct _DDXTouchPointInfo {
-     uint32_t ddx_id;            /* touch ID given by the DDX */
-     Bool emulate_pointer;
- 
--    ValuatorMask *valuators;    /* last recorded axis values */
-+    ValuatorMask *valuators;    /* last axis values as posted, pre-transform */
- } DDXTouchPointInfoRec;
- 
- typedef struct _TouchClassRec {
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-chromeos-mode.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-chromeos-mode.patch
deleted file mode 100644
index edf5d6d9cc..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-chromeos-mode.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -aur xorg-server-1.12.4/hw/xfree86/modes/xf86Crtc.c xorg-server-1.12.4.work/hw/xfree86/modes/xf86Crtc.c
---- xorg-server-1.12.4/hw/xfree86/modes/xf86Crtc.c	2012-08-26 22:11:00.000000000 -0700
-+++ xorg-server-1.12.4.work/hw/xfree86/modes/xf86Crtc.c	2012-10-26 16:34:34.316834000 -0700
-@@ -2208,6 +2208,53 @@
- }
- 
- static Bool
-+xf86TargetChromeOS(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
-+                   DisplayModePtr *modes, Bool *enabled,
-+                   int width, int height)
-+{
-+    int o, p;
-+    DisplayModePtr main_output_mode;
-+    xf86OutputPtr main_output = NULL;
-+    Bool found = FALSE;
-+
-+    /* Find the main output */
-+    for (o = -1; nextEnabledOutput(config, enabled, &o); )
-+    {
-+        if ( !strncmp(config->output[o]->name, "LVDS", 4) ||
-+             !strncmp(config->output[o]->name, "eDP", 3) )
-+        {
-+            main_output = config->output[o];
-+            break;
-+        }
-+    }
-+
-+    /* If we didn't find anything, grab the first enabled output */
-+    if (!main_output) {
-+        o = -1;
-+        nextEnabledOutput(config, enabled, &o);
-+        main_output = config->output[o];
-+    }
-+
-+    if (!main_output)
-+        return FALSE;
-+
-+    if (!(main_output_mode = xf86OutputHasPreferredMode(main_output,
-+                                                        width, height)))
-+        return FALSE;
-+
-+    /* Actually do the modesetting: turn off all non-main monitors */
-+    for (o = -1; nextEnabledOutput(config, enabled, &o); )
-+    {
-+        if (config->output[o] == main_output)
-+            modes[o] = main_output_mode;
-+        else
-+            (*config->output[o]->funcs->dpms)(config->output[o], DPMSModeOff);
-+    }
-+
-+    return TRUE;
-+}
-+
-+static Bool
- xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green,
-                         float gamma_blue)
- {
-@@ -2369,6 +2416,8 @@
-     else {
-         if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
-             xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
-+        else if (xf86TargetChromeOS(scrn, config, modes, enabled, width, height))
-+            xf86DrvMsg(i, X_INFO, "Using ChromeOS mode for initial modes\n");
-         else if (xf86TargetPreferred
-                  (scrn, config, modes, enabled, width, height))
-             xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-no-default-cursor.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-no-default-cursor.patch
deleted file mode 100644
index 16e872e277..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-no-default-cursor.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Subject: [PATCH] no default cursor
-
-Revive the Xserver's null-root-cursor option.
----
- configure.ac            |    7 +++++++
- dix/cursor.c            |   17 +++++++++++++++++
- include/dix-config.h.in |    3 +++
- 3 files changed, 27 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 03beb36..e4d0163 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -566,6 +566,9 @@ AC_ARG_ENABLE(install-libxf86config,
- 				[Install libxf86config (default: disabled)]),
- 				[INSTALL_LIBXF86CONFIG=$enableval],
- 				[INSTALL_LIBXF86CONFIG=no])
-+AC_ARG_ENABLE(null-root-cursor, AS_HELP_STRING([--enable-null-root-cursor], [Use an empty root cursor (default: use core cursor)]),
-+                                 [NULL_ROOT_CURSOR=$enableval],
-+                                 [NULL_ROOT_CURSOR=no])
- AC_ARG_ENABLE(visibility,     AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),
- 				[SYMBOL_VISIBILITY=$enableval],
- 				[SYMBOL_VISIBILITY=auto])
-@@ -1239,6 +1242,10 @@ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
- XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
- REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
- 
-+if test "x$NULL_ROOT_CURSOR" = xyes; then
-+        AC_DEFINE(NULL_ROOT_CURSOR, 1, [Use an empty root cursor])
-+fi
-+
- PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"])
- if test "x$have_libxdmcp" = xyes; then
- 	AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])
-diff --git a/dix/cursor.c b/dix/cursor.c
-index 6bff447..8771abf 100644
---- a/dix/cursor.c
-+++ b/dix/cursor.c
-@@ -455,10 +455,26 @@ CursorPtr
- CreateRootCursor(char *unused1, unsigned int unused2)
- {
-     CursorPtr curs;
-+#ifdef NULL_ROOT_CURSOR
-+    CursorMetricRec cm;
-+#else
-     FontPtr cursorfont;
-     int err;
-     XID fontID;
-+#endif
-+
-+#ifdef NULL_ROOT_CURSOR
-+    cm.width = 0;
-+    cm.height = 0;
-+    cm.xhot = 0;
-+    cm.yhot = 0;
- 
-+    AllocARGBCursor(NULL, NULL, NULL, &cm, 0, 0, 0, 0, 0, 0,
-+                    &curs, serverClient, (XID)0);
-+
-+    if (curs == NullCursor)
-+        return NullCursor;
-+#else
-     fontID = FakeClientID(0);
-     err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync,
-                    (unsigned) strlen(defaultCursorFont), defaultCursorFont);
-@@ -472,6 +488,7 @@ CreateRootCursor(char *unused1, unsigned int unused2)
-     if (AllocGlyphCursor(fontID, 0, fontID, 1, 0, 0, 0, ~0, ~0, ~0,
-                          &curs, serverClient, (XID) 0) != Success)
-         return NullCursor;
-+#endif
- 
-     if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer) curs))
-         return NullCursor;
-diff --git a/include/dix-config.h.in b/include/dix-config.h.in
-index 3fb6413..d9871d4 100644
---- a/include/dix-config.h.in
-+++ b/include/dix-config.h.in
-@@ -402,6 +402,9 @@
- /* Support HAL for hotplug */
- #undef CONFIG_HAL
- 
-+/* Use an empty root cursor */
-+#undef NULL_ROOT_CURSOR
-+
- /* Have a monotonic clock from clock_gettime() */
- #undef MONOTONIC_CLOCK
- 
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm-setup.initd-1 b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm-setup.initd-1
deleted file mode 100644
index 365664e665..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm-setup.initd-1
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $
-
-depend() {
-	need localmount
-}
-
-start() {
-	if get_bootparam "nox" ; then
-		touch /etc/.noxdm
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.confd-4 b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.confd-4
deleted file mode 100644
index c82fece01c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.confd-4
+++ /dev/null
@@ -1,10 +0,0 @@
-# We always try and start X on a static VT. The various DMs normally default
-# to using VT7. If you wish to use the xdm init script, then you should ensure
-# that the VT checked is the same VT your DM wants to use. We do this check to
-# ensure that you haven't accidentally configured something to run on the VT
-# in your /etc/inittab file so that you don't get a dead keyboard.
-CHECKVT=7
-
-# What display manager do you use ?  [ xdm | gdm | kdm | gpe | entrance ]
-# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
-DISPLAYMANAGER="xdm"
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.initd-8 b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.initd-8
deleted file mode 100644
index 539cac107c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.initd-8
+++ /dev/null
@@ -1,216 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-8,v 1.1 2012/05/01 22:08:46 chithanh Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem:  if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2.  When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-#  x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel.  Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
-	need localmount xdm-setup
-
-	# this should start as early as possible
-	# we can't do 'before *' as that breaks it
-	# (#139824) Start after ypbind and autofs for network authentication
-	# (#145219 #180163) Could use lirc mouse as input device
-	# (#70689 comment #92) Start after consolefont to avoid display corruption
-	# (#291269) Start after quota, since some dm need readable home
-	# (#390609) gdm-3 will fail when dbus is not running
-	# (#366753) starting keymaps after X causes problems
-	after bootmisc consolefont modules netmount
-	after readahead-list ypbind autofs openvpn gpm lircmd
-	after quota keymaps
-	before alsasound
-
-	# Start before X
-	use consolekit dbus xfs
-}
-
-setup_dm() {
-	local MY_XDM
-	
-	MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
-
-	# Load our root path from profile.env
-	# Needed for kdm
-	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
-
-	NAME=
-	case "${MY_XDM}" in
-		kdm|kde)
-			EXE=/usr/bin/kdm
-			PIDFILE=/var/run/kdm.pid
-			;;
-		entrance*)
-			EXE=/usr/sbin/entranced
-			PIDFILE=/var/lib/entranced.pid
-			;;
-		gdm|gnome)
-			EXE=/usr/bin/gdm
-			[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
-			PIDFILE=/var/run/gdm.pid
-			;;
-		wdm)
-			EXE=/usr/bin/wdm
-			PIDFILE=
-			;;
-		gpe)
-			EXE=/usr/bin/gpe-dm
-			PIDFILE=/var/run/gpe-dm.pid
-			;;
-		lxdm)
-			EXE=/usr/sbin/lxdm-binary
-			PIDFILE=/var/run/lxdm.pid
-			START_STOP_ARGS="--background"
-			;;
-		lightdm)
-			EXE=/usr/sbin/lightdm
-			PIDFILE=/var/run/lightdm.pid
-			START_STOP_ARGS="--background"
-			;;
-		*)
-			# first find out if there is such executable
-			EXE="$(command -v ${MY_XDM} 2>/dev/null)"
-			PIDFILE="/var/run/${MY_XDM}.pid"
-
-			# warn user that he is doing sick things if the exe was not found
-			if [ -z "${EXE}" ]; then
-				echo "ERROR: Your XDM value is invalid."
-				echo "  No ${MY_XDM} executable could be found on your system."
-			fi
-			;;
-	esac
-
-	if ! [ -x "${EXE}" ]; then
-		EXE=/usr/bin/xdm
-		PIDFILE=/var/run/xdm.pid
-		if ! [ -x "/usr/bin/xdm" ]; then
-			echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
-			echo "	or install x11-apps/xdm package"
-			eend 255
-		fi
-	fi
-}
-
-# Check to see if something is defined on our VT
-vtstatic() {
-	if [ -e /etc/inittab ] ; then
-		grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
-	elif [ -e /etc/ttys ] ; then
-		grep -q "^ttyv$(($1 - 1))" /etc/ttys
-	else
-		return 1
-	fi
-}
-
-start() {
-	local EXE NAME PIDFILE
-	setup_dm
-
-	if [ -f /etc/.noxdm ]; then
-		einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
-		rm /etc/.noxdm
-		return 0
-	fi
-
-	ebegin "Setting up ${EXE##*/}"
-
-	# save the prefered DM
-	save_options "service" "${EXE}"
-	save_options "name"    "${NAME}"
-	save_options "pidfile" "${PIDFILE}"
-	save_options "start_stop_args" "${START_STOP_ARGS}"
-
-	if [ -n "${CHECKVT-y}" ] ; then
-		if vtstatic "${CHECKVT:-7}" ; then
-			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
-				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
-				telinit a >/dev/null 2>&1
-				return 0
-			else
-				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
-				return 1
-			fi
-		fi
-	fi
-
-	/etc/X11/startDM.sh
-	eend 0
-}
-
-stop() {
-	local curvt retval
-
-	retval=0
-	if [ -t 0 ]; then
-		if type fgconsole >/dev/null 2>&1; then
-			curvt=$(fgconsole 2>/dev/null)
-		else
-			curvt=$(tty)
-			case "${curvt}" in
-				/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
-				*) curvt= ;;
-			esac
-		fi
-	fi
-	local myexe myname mypidfile myservice
-	myexe=$(get_options "service")
-	myname=$(get_options "name")
-	mypidfile=$(get_options "pidfile")
-	myservice=${myexe##*/}
-
-	[ -z "${myexe}" ] && return 0
-
-	ebegin "Stopping ${myservice}"
-
-	if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
-		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
-			${mypidfile:+--pidfile} ${mypidfile} \
-			${myname:+--name} ${myname}
-		retval=${?}
-	fi
-
-	# switch back to original vt
-	if [ -n "${curvt}" ]; then
-		if type chvt >/dev/null 2>&1; then
-			chvt "${curvt}"
-		else
-			vidcontrol -s "$((curvt + 1))"
-		fi
-	fi
-
-	eend ${retval} "Error stopping ${myservice}"
-	return ${retval}
-}
-
-# vim: set ts=4 :
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
deleted file mode 100644
index 9a8b9149e9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 2693ce7..ac752fc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then
- 		  	linux_alpha=yes
- 			;;
- 		  i*86|amd64*|x86_64*|ia64*)
--			linux_acpi="yes"
- 			;;
- 		  *)
- 			;;
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-sets.conf b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-sets.conf
deleted file mode 100644
index 5cd8112f58..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-sets.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Rebuild all X11 modules (mostly useful after xorg-server ABI change).
-[x11-module-rebuild]
-class = portage.sets.dbapi.VariableSet
-world-candidate = false
-variable = CATEGORY
-includes = x11-drivers
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/xorg-server-1.12.4-r10.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/xorg-server-1.12.4-r10.ebuild
deleted file mode 100644
index 6648d602b4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/xorg-server-1.12.4-r10.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.9 2012/07/22 12:54:50 chithanh Exp $
-
-EAPI=4
-
-XORG_DOC=doc
-XORG_EAUTORECONF="yes"
-inherit flag-o-matic xorg-2 multilib versionator
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-# +suid needed because sparcs default off
-IUSE="${IUSE_SERVERS} broken_partialswaps -doc ipv6 minimal nptl selinux +suid tegra tslib +udev"
-
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
-	dev-libs/openssl
-	media-libs/freetype
-	>=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/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-7.8_rc[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=sys-fs/udev-150 )
-	>=x11-apps/xinit-1.3
-	selinux? ( sec-policy/selinux-xserver )"
-
-DEPEND="${RDEPEND}
-	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/glproto-1.4.14
-	>=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
-	)"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
-
-	# Allow usage of monotonic clock while cross-compiling.
-	"${FILESDIR}/1.11.99.902-monotonic-clock-fix.patch"
-	"${FILESDIR}/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch"
-	# Match the behaviour of monitor_reconfigure at X.Org startup time.
-	"${FILESDIR}/1.9.3-chromeos-mode.patch"
-	# Allow setting the root window background to nothing to further reduce
-	# flicker when showing and hiding the composite overlay window.
-	"${FILESDIR}/1.11.99.902-allow-root-none.patch"
-	# Refcount glxdrawables to avoid crashes on double free()
-	"${FILESDIR}/1.11.99.902-refcnt-glxdrawable.patch"
-
-	"${FILESDIR}/1.11.99.902-chromium-mouse-accel-profile.patch"
-
-	"${FILESDIR}/1.11.99.902-xserver-bg-none-root.patch"
-	# Dont load a default X cursor.
-	"${FILESDIR}/1.9.3-no-default-cursor.patch"
-	# Ability to run without root privs
-	"${FILESDIR}/1.11.99.902-nohwaccess.patch"
-	# Don't attend clients which are already gone, race condition in dri2
-	"${FILESDIR}/1.12.0-do-not-attend-gone-clients.patch"
-	# crosbug.com/p/11408
-	"${FILESDIR}/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch"
-	# Fix for xfixes pointer barriers
-	"${FILESDIR}/1.12.0-xfixes-safer-barriers.patch"
-	# crosbug.com/33813
-	"${FILESDIR}/1.12.0-suffix-match-udev-paths.patch"
-	# crosbug.com/31570
-	"${FILESDIR}/1.12.0-os-block-signals-when-accessing-global-timer-list.patch"
-	# Fix for crash with floating touchscreen (http://crosbug.com/27529)
-	"${FILESDIR}/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch"
-	# Add the flag to specify the maximum VT the user can switch to
-	"${FILESDIR}/1.12.0-add-maxvt-flag.patch"
-	# Save touchpoint last coordinates before transform
-	"${FILESDIR}/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch"
-	# crbug.com/30822
-	"${FILESDIR}/1.12.4-Per-Randr-CRTC-pointer-scaling.patch"
-)
-
-src_prepare() {
-	# Partial flips
-	if use broken_partialswaps; then
-		PATCHES+=(
-		"${FILESDIR}/1.12.0-emulate-partial-flips.patch"
-		)
-	fi
-	xorg-2_src_prepare
-}
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
-}
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable tslib)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !tegra dri)
-		$(use_enable !tegra dri2)
-		$(use_enable !arm glx)
-		$(use_enable !arm vgahw)
-		$(use_enable !arm vbe)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_enable suid install-setuid)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-fontrootdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--disable-config-hal
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-		--disable-xvmc
-		--disable-xdmcp
-		--disable-screensaver
-		--disable-xdm-auth-1
-		--disable-dbe
-		--disable-xinerama
-		--disable-dga
-		--disable-xace
-		--disable-config-dbus
-		--disable-config-hal
-		--disable-clientids
-		--disable-xf86vidmode
-		--disable-registry
-		--disable-xfake
-		--disable-dmx
-		--disable-xvfb
-		--disable-xnest
-		--enable-null-root-cursor
-		--with-default-font-path=built-ins
-	)
-
-	if use amd64 || use x86 ; then
-		XORG_CONFIGURE_OPTIONS+=( --enable-xaa)
-	else
-		XORG_CONFIGURE_OPTIONS+=( --disable-xaa)
-	fi
-
-	# Things we may want to remove later:
-	#	--disable-xaa (requires dropping all xaa drivers)
-	#	--disable-xv (requires fixing the drivers)
-	#	--disable-tcp-transport
-	#	--disable-ipv6
-	#	--disable-secure-rpc
-
-	# Xorg-server requires includes from OS mesa which are not visible for
-	# users of binary drivers.
-	mkdir -p "${T}/mesa-symlinks/GL"
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	append-cppflags "-I${T}/mesa-symlinks"
-
-	# Make breakage less obvious, bug #402285.
-	replace-flags -O3 -O2
-}
-
-src_install() {
-	xorg-2_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-8 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-
-	# crosbug.com/11553
-	dosym /usr/bin/Xorg /usr/bin/X11/X || die
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-
-	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
-		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
-		ewarn "because the ABI changed. If you cannot start X because"
-		ewarn "of module version mismatch errors, this is your problem."
-
-		echo
-		ewarn "You can generate a list of all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
-		ewarn "or using sets from portage-2.2:"
-		ewarn "	emerge @x11-module-rebuild"
-	fi
-
-	if use udev && has_version sys-fs/udev[-keymap]; then
-		ewarn "sys-fs/udev was built without keymap support. This may cause input device"
-		ewarn "autoconfiguration to fail."
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
-		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/files/50-mali.rules b/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/files/50-mali.rules
deleted file mode 100644
index 039a7f09c2..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/files/50-mali.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="mali0", MODE="0660", GROUP="video"
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1-r0.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1-r0.ebuild
deleted file mode 120000
index 59f248a330..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1-r0.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-mali-rules-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1.ebuild
deleted file mode 100644
index 09f6eacb53..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Rules for setting permissions right on /dev/mali0"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="arm"
-IUSE=""
-
-# Because this ebuild has no source package, "${S}" doesn't get
-# automatically created.  The compile phase depends on "${S}" to
-# exist, so we make sure "${S}" refers to a real directory.
-#
-# The problem is apparently an undocumented feature of EAPI 4;
-# earlier versions of EAPI don't require this.
-S="${WORKDIR}"
-
-src_install() {
-	insinto /etc/udev/rules.d
-	doins "${FILESDIR}"/50-mali.rules
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/ChangeLog b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/ChangeLog
deleted file mode 100644
index f69d094d31..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/ChangeLog
+++ /dev/null
@@ -1,1512 +0,0 @@
-# ChangeLog for x11-drivers/nvidia-drivers
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.268 2011/01/24 18:13:43 cardoe Exp $
-
-*nvidia-drivers-270.18 (24 Jan 2011)
-
-  24 Jan 2011; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-270.18.ebuild:
-  Add new nvidia-drivers beta. Adds a new library and adds initial support for
-  X.org 1.10
-
-*nvidia-drivers-260.19.36 (24 Jan 2011)
-
-  24 Jan 2011; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-260.19.36.ebuild:
-  Version bump. Some minor fixes from upstream.
-
-  25 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
-  nvidia-drivers-96.43.19.ebuild, nvidia-drivers-173.14.28.ebuild,
-  nvidia-drivers-260.19.29.ebuild:
-  stable x86, bug 348186
-
-  24 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
-  nvidia-drivers-96.43.19.ebuild, nvidia-drivers-260.19.29.ebuild:
-  amd64 stable wrt #348186
-
-  23 Dec 2010; Richard Freeman <rich0@gentoo.org>
-  nvidia-drivers-173.14.28.ebuild:
-  amd64 stable - 348186
-
-*nvidia-drivers-260.19.29 (14 Dec 2010)
-
-  14 Dec 2010; Jeroen Roovers <jer@gentoo.org>
-  +nvidia-drivers-260.19.29.ebuild:
-  Version bump (bug #347371).
-
-*nvidia-drivers-173.14.28 (06 Dec 2010)
-
-  06 Dec 2010; Jeroen Roovers <jer@gentoo.org>
-  +nvidia-drivers-173.14.28.ebuild:
-  Version bump by radfoj (bug #342361).
-
-*nvidia-drivers-260.19.26 (01 Dec 2010)
-
-  01 Dec 2010; Michał Januszewski <spock@gentoo.org>
-  +nvidia-drivers-260.19.26.ebuild:
-  Version bump. This is a beta version (and thus masked), but it is also the
-  first 260.x release that works with GF330M.
-
-  20 Nov 2010; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.19.ebuild:
-  Free xorg-server dependency (bug #345929).
-
-*nvidia-drivers-96.43.19 (19 Nov 2010)
-
-  19 Nov 2010; Jeroen Roovers <jer@gentoo.org> +nvidia-drivers-96.43.19.ebuild:
-  Version bump by Miguel R. Caudevilla (bug #345929).
-
-*nvidia-drivers-260.19.21 (18 Nov 2010)
-
-  18 Nov 2010; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-260.19.06.ebuild, -nvidia-drivers-260.19.12.ebuild,
-  +nvidia-drivers-260.19.21.ebuild:
-  Bump to the latest official release. Remove beta releases.
-
-*nvidia-drivers-260.19.12 (15 Oct 2010)
-
-  15 Oct 2010; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-260.19.12.ebuild:
-  Version bump for new upstream release. Added a note about what USE=gtk
-  does when you disable it.
-
-  14 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
-  nvidia-drivers-96.43.18.ebuild, nvidia-drivers-173.14.27.ebuild,
-  nvidia-drivers-195.36.31.ebuild:
-  stable x86, bug 332501
-
-  21 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
-  nvidia-drivers-96.43.18.ebuild, nvidia-drivers-173.14.27.ebuild,
-  nvidia-drivers-195.36.31.ebuild:
-  Stable on amd64. Bug #332501
-
-*nvidia-drivers-260.19.06 (20 Sep 2010)
-
-  20 Sep 2010; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-260.19.04.ebuild, +nvidia-drivers-260.19.06.ebuild:
-  beta version bump
-
-  11 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  -nvidia-drivers-185.18.36-r1.ebuild:
-  Remove version depending on deprecated xorg-server.
-
-*nvidia-drivers-260.19.04 (08 Sep 2010)
-
-  08 Sep 2010; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-260.19.04.ebuild:
-  Version bump for latest beta release
-
-*nvidia-drivers-256.53 (31 Aug 2010)
-
-  31 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-256.53.ebuild:
-  version bump
-
-  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild:
-  fix up blocker with media-video/nvidia-settings
-
-  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild:
-  Implement installing nvidia-settings when USE=gtk is enabled as discussed
-  in bug #304255
-
-  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-256.52.ebuild:
-  Fix xorg-server depend to properly include the 1.9 series
-
-  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-96.43.14.ebuild, -nvidia-drivers-173.14.22.ebuild,
-  -nvidia-drivers-195.36.15.ebuild, -nvidia-drivers-256.35.ebuild:
-  Clear out some older versions that have been supplanted by newer stable
-  versions
-
-  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-71.86.11.ebuild:
-  Removee versions that rely on xorg-server-1.4 or older (which is no longer
-  in the tree).
-
-*nvidia-drivers-256.52 (30 Aug 2010)
-*nvidia-drivers-256.44-r1 (30 Aug 2010)
-
-  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-256.44-r1.ebuild, +nvidia-drivers-256.52.ebuild:
-  version bump and several clean ups to bring the ebuild up to the state of
-  the current unmasked ebuilds
-
-*nvidia-drivers-256.44 (04 Aug 2010)
-
-  04 Aug 2010; Michał Januszewski <spock@gentoo.org>
-  +nvidia-drivers-256.44.ebuild:
-  Version bump.
-
-  30 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  nvidia-drivers-71.86.11.ebuild, nvidia-drivers-96.43.14.ebuild,
-  nvidia-drivers-96.43.16.ebuild, nvidia-drivers-96.43.18.ebuild,
-  nvidia-drivers-173.14.22.ebuild, nvidia-drivers-173.14.25.ebuild,
-  nvidia-drivers-173.14.27.ebuild, nvidia-drivers-185.18.36-r1.ebuild,
-  nvidia-drivers-190.53-r1.ebuild, nvidia-drivers-195.36.15.ebuild,
-  nvidia-drivers-195.36.24.ebuild, nvidia-drivers-195.36.31.ebuild,
-  nvidia-drivers-256.35.ebuild:
-  Depend on proper emul lib to fix bug #330249.
-
-  27 Jul 2010; Michał Januszewski <spock@gentoo.org>
-  nvidia-drivers-256.35.ebuild:
-  Add a dependency on x11-libs/libXvMC (bug #321061).
-
-  20 Jul 2010; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-173.14.27.ebuild:
-  Conditionally install CUDA support if it was found in the package.
-  Apparently 173.14.27 drops CUDA. fixes bug #328681
-
-  17 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
-  nvidia-drivers-173.14.25.ebuild:
-  stable x86, bug 327003
-
-  16 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org>
-  nvidia-drivers-173.14.25.ebuild:
-  amd64 stable, bug 327003
-
-*nvidia-drivers-173.14.27 (16 Jul 2010)
-*nvidia-drivers-96.43.18 (16 Jul 2010)
-
-  16 Jul 2010; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-96.43.18.ebuild, +nvidia-drivers-173.14.27.ebuild:
-  bump available legacy drivers. Added support for xorg-server-1.8 in
-  nvidia-drivers-173.14.27
-
-  15 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
-  nvidia-drivers-96.43.16.ebuild:
-  Stable on amd64 wrt bug #326323
-
-*nvidia-drivers-195.36.31 (13 Jul 2010)
-
-  13 Jul 2010; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-180.60.ebuild, -nvidia-drivers-190.42-r3.ebuild,
-  -nvidia-drivers-190.53.ebuild, -nvidia-drivers-195.30.ebuild,
-  +nvidia-drivers-195.36.31.ebuild:
-  Version bump to the latest 195.36.x. Remove older versions that will no
-  longer be supported. Fix bug #317049 while I'm at it
-
-  10 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
-  nvidia-drivers-96.43.16.ebuild:
-  stable x86, bug 326323
-
-  07 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  nvidia-drivers-195.36.24.ebuild:
-  x86 stable wrt bug #325513
-
-  30 Jun 2010; Jeroen Roovers <jer@gentoo.org> metadata.xml:
-  Correct description.
-
-  26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
-  nvidia-drivers-195.36.24.ebuild:
-  amd64 stable wrt #325513
-
-  24 Jun 2010; Michał Januszewski <spock@gentoo.org>
-  +files/256.35-unified-arch.patch, nvidia-drivers-256.35.ebuild:
-  Add a patch for the 'x86' unified kernel architecture.
-
-*nvidia-drivers-256.35 (24 Jun 2010)
-
-  24 Jun 2010; Michał Januszewski <spock@gentoo.org>
-  +nvidia-drivers-256.35.ebuild:
-  Version bump.
-
-*nvidia-drivers-195.36.24 (25 Apr 2010)
-
-  25 Apr 2010; Justin Lecher <jlec@gentoo.org>
-  +nvidia-drivers-195.36.24.ebuild:
-  Version Bump on permission, #315141
-
-  24 Mar 2010; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-195.36.15.ebuild:
-  clean up some QA warnings
-
-  24 Mar 2010; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-195.36.15.ebuild:
-  add missing nvidia.icd to fix bug #310277
-
-  17 Mar 2010; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-173.14.20.ebuild:
-  still adding back 173.14.20, but repoman doesn't let me stable it right
-  away since the ebuild was stable when it was removed..
-
-  17 Mar 2010; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-173.14.20.ebuild:
-  add back 173.14.20 at the request of Giao Phan <casret@pobox.com> for bug
-  #294089
-
-*nvidia-drivers-195.36.15 (17 Mar 2010)
-
-  17 Mar 2010; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-195.36.15.ebuild:
-  add upstream's pre-release version of the 195.x.y series. Still needs to
-  be tested on further kernels and x86 before unmasking
-
-  10 Mar 2010; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-71.86.09.ebuild, -nvidia-drivers-96.43.13.ebuild,
-  -nvidia-drivers-173.14.20.ebuild, -nvidia-drivers-173.14.20-r1.ebuild,
-  -nvidia-drivers-185.18.36.ebuild, -nvidia-drivers-190.29.ebuild:
-  spring cleaning
-
-  10 Mar 2010; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-195.36.03.ebuild:
-  remove the broken drivers
-
-  28 Feb 2010; Fabio Erculiani <lxnay@gentoo.org>
-  nvidia-drivers-190.53-r1.ebuild,
-  +files/nvidia-drivers-190.53-2.6.33.patch:
-  add 2.6.33 kernel support to 190.53
-
-*nvidia-drivers-173.14.25 (27 Feb 2010)
-
-  27 Feb 2010; Maciej Mrozowski <reavertm@gentoo.org>
-  +nvidia-drivers-173.14.25.ebuild:
-  Version bump, bug 305713
-
-*nvidia-drivers-96.43.16 (15 Feb 2010)
-
-  15 Feb 2010; Jeroen Roovers <jer@gentoo.org>
-  +nvidia-drivers-96.43.16.ebuild:
-  Version bump thanks to John Brendler (bug #304841).
-
-  09 Feb 2010; Pacho Ramos <pacho@gentoo.org>
-  nvidia-drivers-96.43.14.ebuild, nvidia-drivers-173.14.22.ebuild,
-  nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r3.ebuild:
-  amd64 stable, bug 299560
-
-*nvidia-drivers-195.36.03 (08 Feb 2010)
-
-  08 Feb 2010; Michał Januszewski <spock@gentoo.org>
-  +nvidia-drivers-195.36.03.ebuild:
-  Beta version bump (bug #303821).
-
-  07 Feb 2010; Michał Januszewski <spock@gentoo.org>
-  +files/195.30-unified-arch.patch, nvidia-drivers-195.30.ebuild:
-  Add support for the unified 'x86' kernel architecture.
-
-*nvidia-drivers-195.30 (07 Feb 2010)
-
-  07 Feb 2010; Michał Januszewski <spock@gentoo.org>
-  +nvidia-drivers-195.30.ebuild:
-  Add the latest beta drivers with support for CUDA 3.0.
-
-  01 Feb 2010; Christian Faulhammer <fauli@gentoo.org>
-  nvidia-drivers-96.43.14.ebuild, nvidia-drivers-173.14.22.ebuild,
-  nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r3.ebuild:
-  stable x86, bug 299560
-
-*nvidia-drivers-190.53-r1 (04 Jan 2010)
-
-  04 Jan 2010; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-190.53-r1.ebuild:
-  revert the change to install VDPAU drivers to /usr/lib/vdpau since
-  libvdpau's dlopen() usage is incorrect. Stop gap ebuild until the issue is
-  discussed further with upstream.
-
-  21 Dec 2009; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-190.42-r2.ebuild:
-  remove old version
-
-  21 Dec 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-190.53.ebuild:
-  version bump
-
-  17 Dec 2009; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-190.53.ebuild:
-  as stated in bug #296947, this breaks VDPAU, but apparently peper, who's
-  not a maintainer knows better.
-
-*nvidia-drivers-190.53 (16 Dec 2009)
-
-  16 Dec 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-drivers-190.53.ebuild:
-  Add 190.53.
-
-  28 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild:
-  fix bug #276815
-
-  28 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild:
-  remove defunct compat_device_check. bug #294896 and bug #294623
-
-  21 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-185.18.36.ebuild:
-  stabilize for bug #290555
-
-  21 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-71.86.11.ebuild:
-  stabilize for bug #290561
-
-*nvidia-drivers-96.43.14 (13 Nov 2009)
-
-  13 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-96.43.14.ebuild:
-  version bump for xorg-server 1.7 support. ebuild uses the refactored
-  ebuild as a base
-
-*nvidia-drivers-173.14.22 (13 Nov 2009)
-
-  13 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-173.14.22.ebuild:
-  version bump for xorg-server 1.7 support. ebuild uses the refactored
-  ebuild as a base
-
-  12 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-190.42-r3.ebuild:
-  fix bash syntax error
-
-*nvidia-drivers-190.29 (09 Nov 2009)
-
-  09 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-190.29.ebuild:
-  add 190.29 series for OpenCL support
-
-  06 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-190.42-r3.ebuild:
-  oops. fix issue where we might remove vdpau and cuda files
-
-  06 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-190.42-r3.ebuild:
-  more FreeBSD fixes
-
-*nvidia-drivers-190.42-r3 (06 Nov 2009)
-
-  06 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-190.42-r3.ebuild:
-  remove generation of libGL.la since eselect-opengl-1.0.9 and newer no
-  longer uses it. refactor installation of libraries to fix FreeBSD issues
-
-  06 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-190.42-r2.ebuild:
-  add NV_X11_DRV and NV_X11_EXT to deal with different location of files on
-  FreeBSD
-
-  03 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-190.42-r2.ebuild:
-  clean up x86 QA_ settings
-
-  03 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-185.18.36-r1.ebuild, -nvidia-drivers-190.42-r1.ebuild,
-  nvidia-drivers-190.42-r2.ebuild:
-  no longer need to block newer mesa since eselect-opengl has been updated.
-  remove older revision of 190.42
-
-  01 Nov 2009; Michael Sterrett <mr_bones_@gentoo.org>
-  nvidia-drivers-173.14.20.ebuild, nvidia-drivers-173.14.20-r1.ebuild,
-  nvidia-drivers-180.60.ebuild, nvidia-drivers-185.18.36.ebuild,
-  nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild,
-  nvidia-drivers-190.42-r2.ebuild:
-  fix typo in elog (bug #291397)
-
-*nvidia-drivers-190.42-r2 (31 Oct 2009)
-
-  31 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-190.42-r2.ebuild:
-  reworked the ebuild for an overall improvement. Should fix several obscure
-  issues people have with different profiles. remove usage of non-TLS
-  libraries since Gentoo has TLS glibc's. still a work in progress for other
-  clean ups.
-
-  29 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild:
-  Quadro NVS 140 support fixed in 185.18.36
-
-*nvidia-drivers-173.14.20-r1 (29 Oct 2009)
-
-  29 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-173.14.20-r1.ebuild:
-  install nvidia-smi application and nvidia-xconfig man page
-
-  29 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild,
-  nvidia-drivers-190.42-r1.ebuild:
-  fix QA_EXECSTACKS issue with libXvMCNVIDIA as reported in bug #290258
-
-  29 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild,
-  nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.20.ebuild,
-  nvidia-drivers-180.60.ebuild, nvidia-drivers-185.18.36.ebuild,
-  nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild:
-  >=media-libs/mesa-7.6 makes changes to the libGL.la behavior with eselect
-  that will cause OpenGL to be broken
-
-  29 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-185.18.14.ebuild, -nvidia-drivers-185.18.29.ebuild,
-  -nvidia-drivers-185.18.31.ebuild, -nvidia-drivers-190.18.ebuild,
-  -nvidia-drivers-190.25.ebuild, -nvidia-drivers-190.32.ebuild,
-  -nvidia-drivers-190.36.ebuild, -nvidia-drivers-190.40.ebuild,
-  -nvidia-drivers-190.42.ebuild:
-  cull older version
-
-  29 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-190.42.ebuild, nvidia-drivers-190.42-r1.ebuild:
-  fix xorg-server version dependency
-
-  27 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
-  nvidia-drivers-190.42.ebuild, nvidia-drivers-190.42-r1.ebuild:
-  Remove <x11-base/xorg-server-1.6.99 depend because they are working with
-  xorg-server-1.7.1.
-
-  26 Oct 2009; Jeroen Roovers <jer@gentoo.org>
-  -nvidia-drivers-96.43.09.ebuild, -nvidia-drivers-96.43.11.ebuild,
-  -nvidia-drivers-173.14.15.ebuild, -nvidia-drivers-173.14.18.ebuild,
-  -nvidia-drivers-180.29.ebuild:
-  Remove old 96, 173 and 180.
-
-  26 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
-  nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.20.ebuild:
-  amd64 stable wrt #281302
-
-  22 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild:
-  don't install the vdpau headers since libvdpau provides those now
-
-*nvidia-drivers-190.42-r1 (22 Oct 2009)
-*nvidia-drivers-185.18.36-r1 (22 Oct 2009)
-
-  22 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-185.18.36-r1.ebuild, +nvidia-drivers-190.42-r1.ebuild:
-  Update to new way of shipping VDPAU wrapper in its own library from
-  Freedesktop after discussing distro packaging with NVIDIA.
-
-*nvidia-drivers-190.42 (22 Oct 2009)
-
-  22 Oct 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-drivers-190.42.ebuild:
-  Add 190.42.
-
-  22 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-185.18.31.ebuild, nvidia-drivers-185.18.36.ebuild,
-  nvidia-drivers-190.32.ebuild, nvidia-drivers-190.36.ebuild,
-  nvidia-drivers-190.40.ebuild:
-  add note about needing to add QA_LDFLAGS for nvidia-smi
-
-*nvidia-drivers-185.18.36 (21 Oct 2009)
-
-  21 Oct 2009; Jeroen Roovers <jer@gentoo.org>
-  +nvidia-drivers-185.18.36.ebuild:
-  Version bump (bug #288591).
-
-*nvidia-drivers-190.40 (17 Oct 2009)
-
-  17 Oct 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-drivers-190.40.ebuild:
-  Add 190.40.
-
-  06 Oct 2009; Jeroen Roovers <jer@gentoo.org>
-  nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild,
-  nvidia-drivers-96.43.09.ebuild, nvidia-drivers-96.43.11.ebuild,
-  nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.15.ebuild,
-  nvidia-drivers-173.14.18.ebuild, nvidia-drivers-173.14.20.ebuild,
-  nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild,
-  nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild,
-  nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild,
-  nvidia-drivers-190.25.ebuild, nvidia-drivers-190.32.ebuild,
-  nvidia-drivers-190.36.ebuild:
-  Remove elibc_glibc dependency for now as it breaks horribly.
-
-  06 Oct 2009; Jeroen Roovers <jer@gentoo.org>
-  nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild,
-  nvidia-drivers-96.43.09.ebuild, nvidia-drivers-96.43.11.ebuild,
-  nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.15.ebuild,
-  nvidia-drivers-173.14.18.ebuild, nvidia-drivers-173.14.20.ebuild,
-  nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild,
-  nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild,
-  nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild,
-  nvidia-drivers-190.25.ebuild, nvidia-drivers-190.32.ebuild,
-  nvidia-drivers-190.36.ebuild:
-  Replace built_with_use (bug #286961), go EAPI=2 compliant.
-
-*nvidia-drivers-190.36 (27 Sep 2009)
-
-  27 Sep 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-drivers-190.36.ebuild:
-  Add 190.36.
-
-  26 Sep 2009; Michał Januszewski <spock@gentoo.org>
-  nvidia-drivers-190.32.ebuild:
-  Fix bug #283572 (add a check for CONFIG_LOCKDEP).
-
-  26 Sep 2009; Michał Januszewski <spock@gentoo.org>
-  nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.32.ebuild:
-  Fix bug #281895 (install manual pages). Also install the nvidia-smi tool
-  and prepare support for OpenCL (note that the current drivers do NOT
-  support OpenCL).
-
-*nvidia-drivers-190.32 (21 Sep 2009)
-
-  21 Sep 2009; Alex Alexander <wired@gentoo.org>
-  +nvidia-drivers-190.32.ebuild:
-  version bump, beta 190.32
-
-  19 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
-  -nvidia-drivers-71.86.07.ebuild:
-  Cleanup. Removal of old xorg versions.
-
-*nvidia-drivers-190.25 (02 Sep 2009)
-
-  02 Sep 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-drivers-190.25.ebuild:
-  Add 190.25.
-
-  29 Aug 2009; Jeroen Roovers <jer@gentoo.org>
-  nvidia-drivers-96.43.13.ebuild:
-  Stable for x86 (bug #273539).
-
-  27 Aug 2009; Raúl Porcel <armin76@gentoo.org>
-  nvidia-drivers-173.14.20.ebuild:
-  x86 stable
-
-*nvidia-drivers-71.86.11 (23 Aug 2009)
-
-  23 Aug 2009; Jeroen Roovers <jer@gentoo.org>
-  +nvidia-drivers-71.86.11.ebuild:
-  Version bump (bug #280244).
-
-  03 Aug 2009; Michał Januszewski <spock@gentoo.org>
-  nvidia-drivers-185.18.29.ebuild, nvidia-drivers-185.18.31.ebuild:
-  Add a device compatibility check (bug #280031, #279542). Users of graphics
-  cards known to be incompatible with a particular version of the drivers
-  will now be warned about the incompatibility when installing the package.
-
-*nvidia-drivers-173.14.20 (03 Aug 2009)
-
-  03 Aug 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-173.14.20.ebuild:
-  bump 173.x.y series to 173.14.20
-
-  03 Aug 2009; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  update maintainer info
-
-  03 Aug 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild,
-  nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild,
-  nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild,
-  -files/eblits/paravirt_check.eblit:
-  remove paravirt check again. bug #264375 again
-
-  02 Aug 2009; <chainsaw@gentoo.org> nvidia-drivers-71.86.09.ebuild,
-  nvidia-drivers-96.43.11.ebuild:
-  Completely unable to find testers with sufficiently old hardware on AMD64
-  kit; doing a Nike on this in agreement with Jeremy "darkside" Olexa &
-  VQuicksilver. Closes bug #275495.
-
-*nvidia-drivers-185.18.31 (01 Aug 2009)
-
-  01 Aug 2009; Michał Januszewski <spock@gentoo.org>
-  +nvidia-drivers-185.18.31.ebuild:
-  Version bump.
-
-  31 Jul 2009; <chainsaw@gentoo.org> nvidia-drivers-173.14.18.ebuild,
-  nvidia-drivers-180.60.ebuild:
-  Marked stable as requested by Doug Goldstein <cardoe@gentoo.org> in bug
-  #275495. Testing by Víctor "VQuicksilver" Enríquez on a Club3D GeForce
-  7600GS.
-
-*nvidia-drivers-185.18.29 (29 Jul 2009)
-
-  29 Jul 2009; Michał Januszewski <spock@gentoo.org>
-  +nvidia-drivers-185.18.29.ebuild:
-  Version bump (bug #279542).
-
-*nvidia-drivers-190.18 (27 Jul 2009)
-
-  27 Jul 2009; Michał Januszewski <spock@gentoo.org>
-  +nvidia-drivers-190.18.ebuild:
-  Add the latest beta version of the NVIDIA drivers. This is the first
-  version of the drivers in the tree to support CUDA 2.3. This ebuild should
-  remain masked.
-
-*nvidia-drivers-185.18.14 (25 Jul 2009)
-
-  25 Jul 2009; Michał Januszewski <spock@gentoo.org>
-  +nvidia-drivers-185.18.14.ebuild:
-  Version bump (bug #265238).
-
-  22 Jul 2009; Michał Januszewski <spock@gentoo.org> metadata.xml:
-  Add myself as a maintainer.
-
-*nvidia-drivers-96.43.13 (02 Jul 2009)
-
-  02 Jul 2009; Jeroen Roovers <jer@gentoo.org>
-  +nvidia-drivers-96.43.13.ebuild:
-  Version bump.
-
-  29 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  nvidia-drivers-71.86.09.ebuild, nvidia-drivers-96.43.11.ebuild,
-  nvidia-drivers-173.14.18.ebuild, nvidia-drivers-180.60.ebuild:
-  stable x86, bug 275495
-
-  29 Jun 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
-  Add myself as maintainer.
-
-  24 Jun 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-71.86.09.ebuild, nvidia-drivers-96.43.11.ebuild,
-  nvidia-drivers-173.14.18.ebuild:
-  update supported xorg-server version
-
-  14 Jun 2009; Mike Frysinger <vapier@gentoo.org> +files/nvidia-169.07:
-  Restore nvidia-169.07 as it is still in use by newer ebuilds.
-
-  12 Jun 2009; Doug Goldstein <cardoe@gentoo.org>
-  -files/NVIDIA_i2c-hwmon.patch, nvidia-drivers-96.43.09.ebuild,
-  nvidia-drivers-96.43.11.ebuild, nvidia-drivers-173.14.15.ebuild,
-  nvidia-drivers-173.14.18.ebuild, nvidia-drivers-180.29.ebuild,
-  nvidia-drivers-180.60.ebuild:
-  remove NVIDIA_i2c-hwmon.patch as requested by NVIDIA as this isn't safe
-  with certain NVIDIA skus.
-
-  12 Jun 2009; Doug Goldstein <cardoe@gentoo.org>
-  -files/nvidia-2.6.28.patch, -nvidia-drivers-71.86.06.ebuild,
-  -nvidia-drivers-71.86.08.ebuild, -nvidia-drivers-96.43.07.ebuild,
-  -nvidia-drivers-96.43.10.ebuild, -nvidia-drivers-100.14.19.ebuild,
-  -files/nvidia-169.07, -nvidia-drivers-173.14.09.ebuild,
-  -nvidia-drivers-173.14.12.ebuild, -nvidia-drivers-173.14.16.ebuild,
-  -nvidia-drivers-173.14.17.ebuild, -nvidia-drivers-177.80.ebuild,
-  -nvidia-drivers-177.82.ebuild, -nvidia-drivers-180.22.ebuild,
-  -nvidia-drivers-180.27.ebuild, -nvidia-drivers-180.37.ebuild,
-  -nvidia-drivers-180.41.ebuild, -nvidia-drivers-180.44.ebuild,
-  -nvidia-drivers-180.51.ebuild, -files/NVIDIA_glx-makefile.patch:
-  cull old versions
-
-  12 Jun 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-180.22.ebuild, nvidia-drivers-180.27.ebuild,
-  nvidia-drivers-180.29.ebuild, nvidia-drivers-180.37.ebuild,
-  nvidia-drivers-180.41.ebuild, nvidia-drivers-180.44.ebuild,
-  nvidia-drivers-180.51.ebuild, nvidia-drivers-180.60.ebuild:
-  fix paravirt check. bug #261696
-
-*nvidia-drivers-180.60 (27 May 2009)
-
-  27 May 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-180.60.ebuild:
-  version bump. fix QA checks
-
-  06 May 2009; Mike Frysinger <vapier@gentoo.org>
-  nvidia-drivers-71.86.06.ebuild, nvidia-drivers-71.86.07.ebuild,
-  nvidia-drivers-71.86.08.ebuild, nvidia-drivers-71.86.09.ebuild,
-  nvidia-drivers-96.43.07.ebuild, nvidia-drivers-96.43.09.ebuild,
-  nvidia-drivers-96.43.10.ebuild, nvidia-drivers-96.43.11.ebuild,
-  nvidia-drivers-100.14.19.ebuild, nvidia-drivers-173.14.09.ebuild,
-  nvidia-drivers-173.14.12.ebuild, nvidia-drivers-173.14.15.ebuild,
-  nvidia-drivers-173.14.16.ebuild, nvidia-drivers-173.14.17.ebuild,
-  nvidia-drivers-173.14.18.ebuild, nvidia-drivers-177.80.ebuild,
-  nvidia-drivers-177.82.ebuild, nvidia-drivers-180.22.ebuild,
-  nvidia-drivers-180.27.ebuild, nvidia-drivers-180.29.ebuild,
-  nvidia-drivers-180.37.ebuild, nvidia-drivers-180.41.ebuild,
-  nvidia-drivers-180.44.ebuild, nvidia-drivers-180.51.ebuild:
-  Install modprobe.d file as nvidia.conf.
-
-*nvidia-drivers-180.51 (19 Apr 2009)
-
-  19 Apr 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-180.51.ebuild:
-  version bump
-
-*nvidia-drivers-180.44 (30 Mar 2009)
-
-  30 Mar 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-180.44.ebuild:
-  add latest driver release
-
-*nvidia-drivers-173.14.18 (23 Mar 2009)
-*nvidia-drivers-71.86.09 (23 Mar 2009)
-
-  23 Mar 2009; <ricmm@gentoo.org> +nvidia-drivers-71.86.09.ebuild,
-  +nvidia-drivers-173.14.18.ebuild:
-  Version bumps.
-
-*nvidia-drivers-180.41 (23 Mar 2009)
-
-  23 Mar 2009; <ricmm@gentoo.org> +nvidia-drivers-180.41.ebuild:
-  Version bump. See http://www.nvnews.net/vbulletin/showthread.php?p=1963540
-
-*nvidia-drivers-173.14.17 (17 Mar 2009)
-*nvidia-drivers-96.43.11 (17 Mar 2009)
-
-  17 Mar 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-96.43.11.ebuild, +nvidia-drivers-173.14.17.ebuild:
-  version bumps
-
-  17 Mar 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-180.29.ebuild:
-  mark 180.29 stable
-
-*nvidia-drivers-180.37 (09 Mar 2009)
-
-  09 Mar 2009; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-180.35.ebuild, +nvidia-drivers-180.37.ebuild:
-  version bump for several bugs including errors with signal handling.
-  remove broken version
-
-  28 Feb 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
-  custom-cflags is a global USE-flag
-
-*nvidia-drivers-180.35 (25 Feb 2009)
-
-  25 Feb 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-180.35.ebuild:
-  newer version. adds GPU support. fixes OpenGL 3.0 and VDPAU issues.
-
-*nvidia-drivers-180.29 (11 Feb 2009)
-
-  11 Feb 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-180.29.ebuild:
-  version bump
-
-*nvidia-drivers-173.14.16 (04 Feb 2009)
-
-  04 Feb 2009; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-drivers-173.14.16.ebuild:
-  Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126937
-
-*nvidia-drivers-71.86.08 (03 Feb 2009)
-
-  03 Feb 2009; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-drivers-71.86.08.ebuild:
-  Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126955
-
-*nvidia-drivers-96.43.10 (03 Feb 2009)
-
-  03 Feb 2009; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-drivers-96.43.10.ebuild:
-  Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126954
-
-  31 Jan 2009; Alexis Ballier <aballier@gentoo.org>
-  nvidia-drivers-96.43.09.ebuild:
-  Backport the missing bits from the 100. ebuild for x86-fbsd and keyword it
-  since this is apparently the version I need for my GeForce2 MX 400
-
-*nvidia-drivers-180.27 (30 Jan 2009)
-
-  30 Jan 2009; Daniel Gryniewicz <dang@gentoo.org>
-  +nvidia-drivers-180.27.ebuild:
-  Proxy bump to nvidia-drivers-180.27 for cardoe
-
-  20 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
-  nvidia-drivers-96.43.09.ebuild:
-  Non-maintainer commit: Changing <x11-base/xorg-server-1.4.99 to
-  <x11-base/xorg-server-1.5.99 per bug 252359. Tested on Geforce FX 5600,
-  works as well as can be expected. Two users reported it working on bug
-  252359.
-
-*nvidia-drivers-180.22 (16 Jan 2009)
-
-  16 Jan 2009; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-180.22.ebuild:
-  add new version. add vdpau support
-
-  25 Dec 2008; Markus Meier <maekke@gentoo.org>
-  nvidia-drivers-71.86.07.ebuild, nvidia-drivers-96.43.09.ebuild,
-  nvidia-drivers-173.14.15.ebuild, nvidia-drivers-177.82.ebuild:
-  x86 stable, bug #252482
-
-  25 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org>
-  nvidia-drivers-71.86.07.ebuild, nvidia-drivers-96.43.09.ebuild,
-  nvidia-drivers-173.14.15.ebuild, nvidia-drivers-177.82.ebuild:
-  stable amd64, bug 252482. Stable for linux 2.6.27 stabilization
-
-  25 Dec 2008; Mike Frysinger <vapier@gentoo.org>
-  +files/nvidia-2.6.28.patch, nvidia-drivers-177.82.ebuild:
-  Add patch from upstream for linux 2.6.28 support.
-
-*nvidia-drivers-173.14.15 (19 Dec 2008)
-
-  19 Dec 2008; <ricmm@gentoo.org> +nvidia-drivers-173.14.15.ebuild:
-  Version bump. Fixes compilation issues with newer kernels.
-
-*nvidia-drivers-96.43.09 (18 Dec 2008)
-
-  18 Dec 2008; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-96.43.09.ebuild:
-  add beta version of 96.x.y legacy drivers for kernel 2.6.27 support. Fixes
-  bug #242476
-
-  18 Dec 2008; Doug Goldstein <cardoe@gentoo.org>
-  -files/NVIDIA_kernel-169.12-2286310.diff,
-  -files/NVIDIA_kernel-173.08-2404825.diff,
-  -files/NVIDIA_kernel-173.14.05-2419292.diff:
-  remove files that went along with removed versions
-
-  18 Dec 2008; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild:
-  Fix incorrectly not replacing CFLAGS when requested. bug #241800
-
-  18 Dec 2008; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-100.14.09.ebuild, -nvidia-drivers-100.14.11.ebuild,
-  -nvidia-drivers-100.14.23.ebuild, -nvidia-drivers-169.07.ebuild,
-  -nvidia-drivers-169.09.ebuild, -nvidia-drivers-169.09-r1.ebuild,
-  -nvidia-drivers-169.12.ebuild, -nvidia-drivers-173.08.ebuild,
-  -nvidia-drivers-173.14.05.ebuild, -nvidia-drivers-177.13.ebuild,
-  -nvidia-drivers-177.67.ebuild, -nvidia-drivers-177.68.ebuild,
-  -nvidia-drivers-177.70.ebuild:
-  remove outdated releases that no longer have support
-
-  18 Dec 2008; Doug Goldstein <cardoe@gentoo.org>
-  +files/eblits/donvidia.eblit, +files/eblits/mtrr_check.eblit,
-  +files/eblits/paravirt_check.eblit, +files/eblits/src_install-libs.eblit,
-  +files/eblits/want_tls.eblit:
-  Add eblits in the same fashion as sys-libs/glibc that contain commonly
-  used code between all the different versions of nvidia-drivers
-
-*nvidia-drivers-71.86.07 (17 Dec 2008)
-
-  17 Dec 2008; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-71.86.07.ebuild:
-  add 71.86.07 to the tree for 2.6.27 kernel support. This ebuild is
-  refactored like my past refactoring of the ebuilds. More changes to come.
-  Please report issues if you spot them in the ebuild, or suggest
-  improvements.
-
-  13 Dec 2008; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-71.86.06.ebuild, nvidia-drivers-96.43.07.ebuild,
-  nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild,
-  nvidia-drivers-169.07.ebuild, nvidia-drivers-169.09.ebuild,
-  nvidia-drivers-169.09-r1.ebuild, nvidia-drivers-169.12.ebuild,
-  nvidia-drivers-173.08.ebuild, nvidia-drivers-173.14.05.ebuild,
-  nvidia-drivers-173.14.09.ebuild, nvidia-drivers-173.14.12.ebuild,
-  nvidia-drivers-177.13.ebuild, nvidia-drivers-177.67.ebuild,
-  nvidia-drivers-177.68.ebuild, nvidia-drivers-177.70.ebuild,
-  nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild:
-  update all versions to specify the exact xorg-server versions they're
-  compatible with
-
-  06 Dec 2008; Mike Frysinger <vapier@gentoo.org>
-  nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild:
-  Use unpack_makeself rather than executing the script.
-
-*nvidia-drivers-177.82 (03 Dec 2008)
-
-  03 Dec 2008; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-177.82.ebuild:
-  driver version bump. fixes known issues with firefox 3 image corruption.
-  mobile GPU resume from S3 issues. mobile GPU hotkey issues.
-
-*nvidia-drivers-177.80 (13 Oct 2008)
-
-  13 Oct 2008; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-drivers-177.80.ebuild:
-  Version bump for new stable release as per bug #238969. Release notes can be
-  found at http://www.nvnews.net/vbulletin/showthread.php?t=120679
-
-*nvidia-drivers-177.70 (28 Aug 2008)
-
-  28 Aug 2008; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-drivers-177.70.ebuild:
-  Version bump for masked beta. Release highlights at
-  http://www.nvnews.net/vbulletin/showthread.php?p=1759793
-
-*nvidia-drivers-177.68 (27 Aug 2008)
-
-  27 Aug 2008; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-drivers-177.68.ebuild:
-  Version bump for masked beta per bug #235851. Also changed SRC_URI to the
-  generic URL due to being unable to find the file in the US mirror
-
-*nvidia-drivers-177.67 (20 Aug 2008)
-
-  20 Aug 2008; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-drivers-177.67.ebuild:
-  Version bump for masked beta per bug #235231. Release highlights at
-  http://www.nvnews.net/vbulletin/showthread.php?t=118085
-
-  18 Aug 2008; Ricardo Mendoza <ricmm@gentoo.org> metadata.xml:
-  Change maintainer
-
-  05 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-*nvidia-drivers-173.14.12 (31 Jul 2008)
-
-  31 Jul 2008; <chainsaw@gentoo.org> nvidia-drivers-173.14.09.ebuild,
-  +nvidia-drivers-173.14.12.ebuild:
-  Version bump as requested by Wyatt Epp <epp.8@osu.edu> in bug #233418.
-  Ensure SYSVIPC is enabled as per cucu ionut <cuciferus@gmail.com> in bug
-  #213157. Patch to respect custom CFLAGS by boris64 <genzilla@boris64.net>
-  closes bug #230273. Paravirt exports now usable, delete unnecessary check
-  as per Patrizio Bassi <hetfield666@gmail.com> in bug #232883.
-
-  22 Jul 2008; <chainsaw@gentoo.org>
-  -files/NVIDIA_kernel-71.86.04-2305230.diff,
-  -files/NVIDIA_kernel-96.43.05-2290218.diff,
-  -nvidia-drivers-71.86.01.ebuild, -nvidia-drivers-71.86.04.ebuild,
-  nvidia-drivers-71.86.06.ebuild, -nvidia-drivers-96.43.01.ebuild,
-  -nvidia-drivers-96.43.05.ebuild, nvidia-drivers-96.43.07.ebuild:
-  X86 following the AMD64 lead in fasttrack stable for 71 & 96 branch
-  drivers. Arch testing by hoffie, permission granted by tsunam. Closes bug
-  #232624 by Mike Hammill <michael@hammill.name>. Cleaned up old ebuilds.
-
-  17 Jul 2008; <chainsaw@gentoo.org> nvidia-drivers-71.86.06.ebuild,
-  nvidia-drivers-96.43.07.ebuild:
-  Fasttrack AMD64 stable for 2.6.26-capable drivers in the 71 & 96 branches
-  that owners of older GeForces are stuck with. Compile & QA tested by
-  CCIEChad.
-
-*nvidia-drivers-96.43.07 (17 Jul 2008)
-*nvidia-drivers-71.86.06 (17 Jul 2008)
-
-  17 Jul 2008; <chainsaw@gentoo.org> +nvidia-drivers-71.86.06.ebuild,
-  +nvidia-drivers-96.43.07.ebuild:
-  New upstream releases, both fix secondary TV output sometimes being black
-  & white on some GPUs and are compatible with the newly released 2.6.26
-  kernel. Install modprobe control file to /etc/modprobe.d instead of the
-  deprecated /etc/modules.d location, closes bug #213878.
-
-  08 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
-  nvidia-drivers-173.14.09.ebuild:
-  stable x86, bug 230369, thanks to all the testers
-
-  01 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org>
-  nvidia-drivers-173.14.09.ebuild:
-  stable amd64, bug 230369
-
-*nvidia-drivers-177.13 (19 Jun 2008)
-
-  19 Jun 2008; <chainsaw@gentoo.org> +nvidia-drivers-177.13.ebuild:
-  Masked beta driver 177.13; unsupported by nVidia. Adds support for GeForce
-  GTX 260 & 280 products. Upstream release announcement at
-  http://www.nvnews.net/vbulletin/showthread.php?t=114955
-
-*nvidia-drivers-173.14.09 (17 Jun 2008)
-
-  17 Jun 2008; <chainsaw@gentoo.org> +nvidia-drivers-173.14.09.ebuild:
-  Version bump, closes bug #224109. With thanks to Ludovic F.
-  <fludo@tvs2net.ch> for drawing my attention to this bugfix release.
-
-*nvidia-drivers-173.14.05 (28 May 2008)
-
-  28 May 2008; <chainsaw@gentoo.org>
-  +files/NVIDIA_kernel-173.14.05-2419292.diff,
-  +nvidia-drivers-173.14.05.ebuild:
-  Version bump. Supported release, upstream release highlights are at
-  http://www.nvnews.net/vbulletin/showthread.php?t=113919.
-
-  21 May 2008; <chainsaw@gentoo.org>
-  +files/NVIDIA_kernel-71.86.04-2305230.diff,
-  nvidia-drivers-71.86.04.ebuild:
-  Add patch to allow building on 2.6.25 kernels; thanks to Andreas
-  <andreas.schuerch@nativenet.ch>. No revision bump, the module didnt build
-  for affected users. Closes bug #223047.
-
-  09 May 2008; Mark Loeser <halcy0n@gentoo.org>
-  nvidia-drivers-173.08.ebuild:
-  Works on x86 for me, marking ~x86
-
-  08 May 2008; <chainsaw@gentoo.org>
-  files/NVIDIA_kernel-173.08-2404825.diff:
-  Upstream corrected the patch after the fact, update it. No revision bump
-  as the package is masked.
-
-  07 May 2008; <chainsaw@gentoo.org>
-  nvidia-drivers-71.86.01.ebuild, nvidia-drivers-71.86.04.ebuild,
-  nvidia-drivers-96.43.01.ebuild, nvidia-drivers-96.43.05.ebuild,
-  nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild,
-  nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild:
-  Quote variables where appropriate.
-
-*nvidia-drivers-173.08 (07 May 2008)
-
-  07 May 2008; <chainsaw@gentoo.org>
-  +files/NVIDIA_kernel-173.08-2404825.diff, +nvidia-drivers-173.08.ebuild:
-  Masked beta driver 173.08 with upstream patch from Zander (
-  http://www.nvnews.net/vbulletin/showpost.php?p=1648357&postcount=35 ) for
-  >=2.6.26-rc1 compatibility. Dropped keywords as this has only been tested
-  on 2.6.26-rc1-00166-gc0a1811 SMP x86_64 so far. Now installs module
-  control file in modprobe.d where it belongs. Upstream advises to use PAT
-  over MTRR. Some reports of low performance and 2D corruption, tread
-  carefully.
-
-  18 Apr 2008; Mike Frysinger <vapier@gentoo.org>
-  +files/NVIDIA_kernel-96.43.05-2290218.diff,
-  nvidia-drivers-96.43.05.ebuild:
-  Add fix from upstream for building with linux-2.6.25 #218178.
-
-  18 Apr 2008; Mike Frysinger <vapier@gentoo.org>
-  +files/NVIDIA_kernel-169.12-2286310.diff, nvidia-drivers-169.12.ebuild:
-  Add fix from upstream for building with linux-2.6.25 #218178.
-
-  10 Apr 2008; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-169.09-r1.ebuild:
-  revert previous commit due to it breaking the stable tree. it also flies
-  in the face of nvidia-drivers maintenance policies.
-
-  10 Apr 2008; William L. Thomson Jr. <wltjr@gentoo.org>
-  nvidia-drivers-169.09-r1.ebuild:
-  De-stablizing package, lost 3+ hours debugging why a stable machine X was
-  at 99% for any 2d operation, thunderbird etc.
-
-  19 Mar 2008; Raúl Porcel <armin76@gentoo.org>
-  nvidia-drivers-96.43.05.ebuild:
-  x86 stable
-
-  05 Mar 2008; Christian Faulhammer <opfer@gentoo.org>
-  nvidia-drivers-169.09-r1.ebuild:
-  stable x86, bug 212290
-
-  04 Mar 2008; Olivier Crête <tester@gentoo.org>
-  nvidia-drivers-169.09-r1.ebuild:
-  Stable on amd64, bug #212290
-
-*nvidia-drivers-169.12 (28 Feb 2008)
-
-  28 Feb 2008; Doug Goldstein <cardoe@gentoo.org> +nvidia-drivers-169.12.ebuild:
-  version bump
-
-  18 Feb 2008; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-169.09-r1.ebuild:
-  revert libwfb.so change requested in bug #202978
-
-*nvidia-drivers-169.09-r1 (15 Feb 2008)
-
-  15 Feb 2008; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-169.09-r1.ebuild:
-  new ebuild that should fix bug #207298, #207299, #167413, #184593, #188552,
-  and #187149. and #202978, depending on the results of the discussion and
-  added work around for bug #137000
-
-*nvidia-drivers-96.43.05 (04 Feb 2008)
-*nvidia-drivers-71.86.04 (04 Feb 2008)
-
-  04 Feb 2008; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-71.86.04.ebuild, +nvidia-drivers-96.43.05.ebuild:
-  new legacy driver releases for newer kernels and X.org servers
-
-*nvidia-drivers-169.09 (22 Jan 2008)
-
-  22 Jan 2008; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-169.07.ebuild,
-  +nvidia-drivers-169.09.ebuild:
-  QA_WX_LOAD addition. new nvidia-drivers version
-
-  22 Jan 2008; Doug Goldstein <cardoe@gentoo.org> +files/nvidia-169.07,
-  nvidia-drivers-169.07.ebuild:
-  provide newer /etc/modules.d file
-
-*nvidia-drivers-169.07 (16 Jan 2008)
-
-  16 Jan 2008; Doug Goldstein <cardoe@gentoo.org> +nvidia-drivers-169.07.ebuild:
-  starting to rewrite the ebuild a bit. commiting masked so people can tinker
-
-  26 Dec 2007; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild:
-  fix patch to nvidia-xconfig on FreeBSD. bug #199761
-
-  21 Dec 2007; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-drivers-1.0.7185.ebuild, -nvidia-drivers-1.0.9639.ebuild:
-  remove old versions
-
-  21 Dec 2007; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild:
-  apply patch only when linux. bug #199759
-
-  20 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
-  nvidia-drivers-71.86.01.ebuild:
-  stable x86, bug 186490
-
-  14 Nov 2007; Steve Dibb <beandog@gentoo.org>
-  nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild:
-  amd64 stable, bug 186490
-
-  12 Nov 2007; Peter Weller <welp@gentoo.org>
-  nvidia-drivers-100.14.19.ebuild:
-  Stable on amd64 wrt bug 186490
-
-*nvidia-drivers-100.14.23 (01 Nov 2007)
-
-  01 Nov 2007; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-100.14.23.ebuild:
-  adding beta NVIDIA driver for user demand. bug #196679
-
-  31 Oct 2007; Raúl Porcel <armin76@gentoo.org>
-  nvidia-drivers-96.43.01.ebuild:
-  x86 stable
-
-  29 Oct 2007; Markus Ullmann <jokey@gentoo.org>
-  nvidia-drivers-100.14.19.ebuild:
-  Stable on x86
-
-  29 Oct 2007; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-100.14.19.ebuild:
-  add x86-fbsd support for 100.14.19 since it's been released now
-
-  07 Oct 2007; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild,
-  nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild,
-  nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild,
-  nvidia-drivers-100.14.19.ebuild:
-  Quote some old $ROOT usage
-
-  07 Oct 2007; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild,
-  nvidia-drivers-100.14.19.ebuild:
-  nvidia-driver uses ACPI if it's installed. Add USE based dep on it.
-
-  01 Oct 2007; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild:
-  mark the depends as not supporting xorg-server 1.4
-
-*nvidia-drivers-96.43.01 (27 Sep 2007)
-*nvidia-drivers-71.86.01 (27 Sep 2007)
-
-  27 Sep 2007; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-71.86.01.ebuild, +nvidia-drivers-96.43.01.ebuild,
-  nvidia-drivers-100.14.19.ebuild:
-  bump both nvidia legacy drivers to their latest revisions. Remove hack since
-  it's no longer needed.
-
-  20 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> -files/nvidia-2,
-  -files/NVIDIA_kernel-2.6.19.patch, files/nvidia,
-  nvidia-drivers-1.0.7185.ebuild, -nvidia-drivers-1.0.8776-r1.ebuild,
-  -nvidia-drivers-1.0.9631-r1.ebuild, nvidia-drivers-1.0.9639.ebuild,
-  -nvidia-drivers-1.0.9746-r1.ebuild, -nvidia-drivers-1.0.9755-r1.ebuild,
-  nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild,
-  nvidia-drivers-100.14.19.ebuild:
-  Removing older ebuilds where newer ebuilds in the same class have the same
-  KEYWORDS or better, moving nvidia-2 to nvidia, since nothing uses the old
-  file anymore, simplified sed by changing ${PACKAGE} to PACKAGE, and changed
-  a newins to doins, since we were not renaming anything.
-
-*nvidia-drivers-100.14.19 (18 Sep 2007)
-
-  18 Sep 2007; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-100.14.19.ebuild:
-  new drivers from nVidia. no FreeBSD support.
-
-  26 Aug 2007; Anant Narayanan <anant@gentoo.org> Manifest:
-  Fix Manifest
-
-  30 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-  nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.8776-r1.ebuild,
-  nvidia-drivers-1.0.9631-r1.ebuild, nvidia-drivers-1.0.9639.ebuild,
-  nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild,
-  nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild:
-  Move eselect-opengl into DEPEND only, so it can be uninstalled later.
-
-  28 Jul 2007; Steve Dibb <beandog@gentoo.org>
-  nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild,
-  nvidia-drivers-100.14.09.ebuild:
-  amd64 stable, bug 183567
-
-  20 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-1.0.7185.ebuild:
-  remove i2c-hwmon, libnvidia-cfg, nvidia-xconfig, and README.txt from 7185
-  since they don't exist
-
-  19 Jul 2007; Raúl Porcel <armin76@gentoo.org>
-  nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild,
-  nvidia-drivers-100.14.09.ebuild
-  x86 stable wrt security #183567
-
-  19 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-100.14.09.ebuild:
-  adding back 100.14.09 based off 100.14.11 ebuild
-
-  18 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild,
-  nvidia-drivers-100.14.11.ebuild:
-  QA EXECSTACK handling
-
-*nvidia-drivers-1.0.7185 (14 Jul 2007)
-
-  14 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-drivers-1.0.7185.ebuild:
-  add 1.0.7185 drivers
-
-*nvidia-drivers-1.0.9639 (14 Jul 2007)
-
-  14 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
-  -files/nvidia-settings.desktop, -files/nvidia-settings.png,
-  +nvidia-drivers-1.0.9639.ebuild, -nvidia-drivers-100.14.09.ebuild,
-  nvidia-drivers-100.14.11.ebuild:
-  add ebuild for 1.0.9639 drivers. Merge in updates from 100.14.11 drivers.
-  Removed old 100.14.09 drivers. No longer build nvidia-settings part of the
-  drivers but PDEPEND on it via gtk USE flag. Other misc cleanups.
-
-  13 Jul 2007; Doug Goldstein <doug@gentoo.org>
-  nvidia-drivers-100.14.11.ebuild:
-  fix bug #185171
-
-  12 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-drivers-100.14.11.ebuild:
-  Fixes #177231, #182622, #184432, #184795
-
-  07 Jul 2007; Doug Goldstein <cardoe@gentoo.org> +files/nvidia-2,
-  +files/NVIDIA_i2c-hwmon.patch, +files/nvidia-settings.desktop,
-  +files/nvidia-settings.png, nvidia-drivers-100.14.11.ebuild:
-  work in progress. fixes bug #183567, #169740, #182933, #184432. More will be
-  fixed before unmask
-
-  05 Jul 2007; Mike Frysinger <vapier@gentoo.org>
-  nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild,
-  nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild,
-  nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild:
-  If glibc does not have IUSE=nptl, assume it is enabled as newer versions
-  only support nptl.
-
-*nvidia-drivers-100.14.11 (04 Jul 2007)
-
-  04 Jul 2007; Christian Parpart <trapni@gentoo.org>
-  +nvidia-drivers-100.14.11.ebuild:
-  version bump to 100.14.11
-
-  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
-  nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild:
-  (QA) RESTRICT clean up.
-
-  01 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
-  nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild,
-  nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild,
-  nvidia-drivers-100.14.09.ebuild:
-  (QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true"
-
-*nvidia-drivers-100.14.09 (19 Jun 2007)
-
-  19 Jun 2007; Christian Parpart <trapni@gentoo.org>
-  +nvidia-drivers-100.14.09.ebuild:
-  version bump. wrt bug #176135 and bug #175674
-
-  13 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  -nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.8776-r1.ebuild:
-  Stable on amd64/x86 wrt bug #114893.
-
-*nvidia-drivers-1.0.9755-r1 (13 Mar 2007)
-*nvidia-drivers-1.0.9746-r1 (13 Mar 2007)
-*nvidia-drivers-1.0.9631-r1 (13 Mar 2007)
-*nvidia-drivers-1.0.8776-r1 (13 Mar 2007)
-
-  13 Mar 2007; Jeremy Huddleston <eradicator@gentoo.org>
-  +nvidia-drivers-1.0.8776-r1.ebuild, -nvidia-drivers-1.0.9631.ebuild,
-  +nvidia-drivers-1.0.9631-r1.ebuild, -nvidia-drivers-1.0.9746.ebuild,
-  +nvidia-drivers-1.0.9746-r1.ebuild, -nvidia-drivers-1.0.9755.ebuild,
-  +nvidia-drivers-1.0.9755-r1.ebuild:
-  Install libnvidia-cfg.so.  Fixes bug #114893.
-
-*nvidia-drivers-1.0.9755 (07 Mar 2007)
-
-  07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  +nvidia-drivers-1.0.9755.ebuild:
-  Version bump to latest version of the drivers.
-
-  19 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.9631.ebuild,
-  nvidia-drivers-1.0.9746.ebuild:
-  Removing dlloader USE flag wrt bug #166759.
-
-  07 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.9631.ebuild,
-  nvidia-drivers-1.0.9746.ebuild:
-  Fixed the executable stack warnings with a patch from Vlastimil Babka
-  <caster@gentoo.org> and closing bug #114894.
-
-  07 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  -nvidia-drivers-1.0.8774.ebuild, -nvidia-drivers-1.0.9742.ebuild:
-  Cleaning up some older versions.
-
-*nvidia-drivers-1.0.9746 (28 Dec 2006)
-
-  28 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  +nvidia-drivers-1.0.9746.ebuild:
-  Added version 9746 and closing bug #158889.
-
-  26 Dec 2006; Mike Frysinger <vapier@gentoo.org>
-  nvidia-drivers-1.0.9742.ebuild:
-  Style touchups and create relative symlinks in /usr/lib.
-
-  12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.9631.ebuild, nvidia-drivers-1.0.9742.ebuild:
-  Update Gentoo/FreeBSD support with a patch from Timothy Redaelli
-  <drizzt@gentoo.org>. Closing bug #157625.
-
-  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  -nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild:
-  Added patch from Joshua Napoli <jnapoli@actuality-systems.com> to install
-  libnvidia-wfb and closing bug #155532. Removing 9629, as it has problems
-  with NV2x cards.
-
-  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  files/NVIDIA_kernel-2.6.19.patch:
-  Updated the NVIDIA_kernel-2.6.19.patch and closing bug #156978.
-
-*nvidia-drivers-1.0.9631 (05 Dec 2006)
-
-  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  +nvidia-drivers-1.0.9631.ebuild:
-  Version bump to 1.0.9631 for bug #157194. This should also close bug
-  #105656, bug #150080, bug #154739, and bug #156886.
-
-  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/nvidia:
-  Updated the nvidia file which installs to /etc/modules.d for bug #139756.
-
-  04 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.8774.ebuild, nvidia-drivers-1.0.8776.ebuild,
-  nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild:
-  Fixing up executable stacks and closing bug #114894.
-
-  10 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  -files/1.0.9626/NVIDIA-1.0.9626-i2c.diff, -nvidia-drivers-1.0.9626.ebuild:
-  Removing the 1.0-9626 driver, since it has been known to cause a black
-  screen at X startup and is superceded by the 9629 driver.
-
-*nvidia-drivers-1.0.9742 (09 Nov 2006)
-*nvidia-drivers-1.0.9629 (09 Nov 2006)
-
-  09 Nov 2006; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-drivers-1.0.9629.ebuild, +nvidia-drivers-1.0.9742.ebuild:
-  Added new stable driver 1.0.9629 and unstable driver 1.0.9742.
-
-  24 Oct 2006; Simon Stelling <blubb@gentoo.org>
-  nvidia-drivers-1.0.8776.ebuild:
-  stable on amd64
-
-  24 Oct 2006; Joshua Jackson <tsunam@gentoo.org>
-  nvidia-drivers-1.0.8776.ebuild:
-  Stable x86; bug #151635
-
-  20 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.8774.ebuild, nvidia-drivers-1.0.8776.ebuild,
-  nvidia-drivers-1.0.9626.ebuild:
-  Added fix for bug #145968.
-
-*nvidia-drivers-1.0.8776 (20 Oct 2006)
-
-  20 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  -files/1.0.8178/NVIDIA-1.0.8178-1423627.diff,
-  -files/1.0.8178/NVIDIA-1.0.8178-1427453.diff,
-  -files/1.0.8178/NVIDIA-1.0.8178-1435131.diff,
-  -files/1.0.8178/NVIDIA-1.0.8178-1450608.diff,
-  -files/1.0.8178/NVIDIA-1.0.8178-1453708.diff,
-  -files/1.0.8178/NVIDIA-1.0.8178-U012206.diff,
-  -nvidia-drivers-1.0.8178.ebuild, +nvidia-drivers-1.0.8776.ebuild:
-  Added 8776 for bug #151635 and removing 8178, since it is vulnerable.
-
-  18 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8774.ebuild,
-  nvidia-drivers-1.0.9626.ebuild:
-  Use pkg2 for AMD64 since the other ones don't ship the 32-bit libraries. How
-  lame is that? Closing bug #151759.
-
-  17 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  -files/1.0.9625/NVIDIA-1.0.9625-i2c.diff,
-  +files/1.0.9626/NVIDIA-1.0.9626-i2c.diff, nvidia-drivers-1.0.8178.ebuild,
-  nvidia-drivers-1.0.8774.ebuild, -nvidia-drivers-1.0.9625.ebuild,
-  nvidia-drivers-1.0.9626.ebuild:
-  Changed pkg1 and pkg2 to pkg0 for bug #146182.
-
-  17 Oct 2006; Olivier Crête <tester@gentoo.org>
-  nvidia-drivers-1.0.9626.ebuild:
-  Patch version is 1.0.9625
-
-  16 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.9626.ebuild:
-  It looks like the i2c patch is still needed.
-
-*nvidia-drivers-1.0.9626 (16 Oct 2006)
-
-  16 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  +nvidia-drivers-1.0.9626.ebuild:
-  Updated to 1.0.9626, which adds support for NVIDIA Quadro Plex configurations.
-
-  13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  +files/NVIDIA_kernel-2.6.19.patch:
-  Added patch from Daniel Drake <dsd@gentoo.org> for compiling on 2.6.19 and
-  closing bug #151177.
-
-  12 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  +files/1.0.8178/NVIDIA-1.0.8178-1423627.diff,
-  +files/1.0.8178/NVIDIA-1.0.8178-1427453.diff,
-  +files/1.0.8178/NVIDIA-1.0.8178-1435131.diff,
-  +files/1.0.8178/NVIDIA-1.0.8178-1450608.diff,
-  +files/1.0.8178/NVIDIA-1.0.8178-1453708.diff,
-  +files/1.0.8178/NVIDIA-1.0.8178-U012206.diff,
-  ,files/1.0.8762/NVIDIA-1.0.8762-U062606.diff:
-  Added patches from nvnews.net for 8178, removing 8762, and adding a notice
-  to 9625 about AddARGBGLXVisuals for compiz.
-
-  09 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.8178.ebuild, -nvidia-drivers-1.0.8762.ebuild,
-  nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild,
-  nvidia-drivers-1.0.9625.ebuild:
-  Removed virtual/x11 from dependencies, removed blocker on nvidia-kernel and
-  nvidia-glx, since they're no longer in the tree, changed nostrip to strip,
-  and added QA variables for TEXTRELS and EXECSTACK for amd64 and x86. Closing
-  bug #114894.
-
-  04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8762.ebuild,
-  nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild,
-  nvidia-drivers-1.0.9625.ebuild:
-  Removed PROVIDE=virtual/opengl since opengl is a new-style virtual.
-
-  04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.8774.ebuild:
-  Stable on amd64/x86 for bug #144549.
-
-  04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.8178.ebuild:
-  Stable on amd64/x86 for bug #143814.
-
-  25 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  +files/1.0.9625/NVIDIA-1.0.9625-i2c.diff, nvidia-drivers-1.0.9625.ebuild:
-  Added patch from Zander to remove i2c functionality from the drivers until
-  it is fixed upstream.
-
-  25 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8762.ebuild,
-  nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild,
-  nvidia-drivers-1.0.9625.ebuild:
-  Commented out the Makefile patch.
-
-*nvidia-drivers-1.0.9625 (25 Sep 2006)
-*nvidia-drivers-1.0.8178 (25 Sep 2006)
-
-  25 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  +files/NVIDIA_glx-makefile.patch, +nvidia-drivers-1.0.8178.ebuild,
-  nvidia-drivers-1.0.8762.ebuild, nvidia-drivers-1.0.8762-r1.ebuild,
-  nvidia-drivers-1.0.8774.ebuild, +nvidia-drivers-1.0.9625.ebuild:
-  Added 8178 ebuild for bug #143814.  Also added a (masked) 9625 beta ebuild.
-
-  27 Aug 2006; Hanno Boeck <hanno@gentoo.org> files/libGL.la-r2:
-  Fix libdir in libGL.la (bug #140982).
-
-  27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>
-  nvidia-drivers-1.0.8774.ebuild:
-  Remove blocker on xorg-server 1.1.
-
-  25 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org> +metadata.xml:
-  Someone forgot to add metadata.
-
-*nvidia-drivers-1.0.8774 (25 Aug 2006)
-
-  25 Aug 2006; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-drivers-1.0.8774.ebuild:
-  Added ebuild for NVIDIA driver release 1.0-8774.
-
-  08 Aug 2006; Joshua Jackson <tsunam@gentoo.org>
-  nvidia-drivers-1.0.8762-r1.ebuild:
-  Stable x86; bug #140922
-
-  06 Aug 2006; Simon Stelling <blubb@gentoo.org>
-  nvidia-drivers-1.0.8762-r1.ebuild:
-  stable on amd64
-
-*nvidia-drivers-1.0.8762-r1 (07 Jul 2006)
-
-  07 Jul 2006; Kristopher Kersey <augustus@gentoo.org>
-  +files/1.0.8762/NVIDIA-1.0.8762-U062606.diff,
-  +nvidia-drivers-1.0.8762-r1.ebuild:
-  Added Zander's patch to allow building with latest kernels (>=
-  2.6.17-rc4-mm1, >= 2.6.17-git7).
-
-  06 Jul 2006; Kristopher Kersey <augustus@gentoo.org>
-  nvidia-drivers-1.0.8762.ebuild:
-  Quick fix to close bug #133138.
-
-*nvidia-drivers-1.0.8762 (06 Jul 2006)
-
-  06 Jul 2006; Kristopher Kersey <augustus@gentoo.org> +files/09nvidia,
-  +files/NVIDIA_glx-defines.patch, +files/NVIDIA_glx-glheader.patch,
-  +files/libGL.la-r2, +files/nvidia, +nvidia-drivers-1.0.8762.ebuild:
-  Initial import of x11-drivers/nvidia-drivers that will take the place of
-  media-video/nvidia-kernel and media-video/nvidia-glx.
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/Manifest
deleted file mode 100644
index 5d3e9f8d20..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST NVIDIA-FreeBSD-x86-260.19.36.tar.gz 27282754 SHA256 03e41a19ad93668034efa8306983b57b69fcca1e328a5a70c9295096fb9675d5 SHA512 0ae75d616202bd054c820ef0dd1cfa16fe0aa7dc73e7abc502aeb2a4c28f3469dc3d089e6e6f4b27c6002c79ab6ca96f8bca52da362f5b088210869f3da60961 WHIRLPOOL 26cc49ff77ef5f324fa73c4c856bdde7f5ce8b1eadc97680adf725eb64c048da829561c481549557855f45e4c54a248fd45c69104e3c1a45a66c6b440d5a5c5a
-DIST NVIDIA-Linux-x86-260.19.36.run 28558478 SHA256 6cfbb7cbfdb8ca5399303d43204e73ca3aad5bbc03c938f11ce5e154ec76cc6d SHA512 56e51ba75a0f82fb81701550a74d318f2693220327bceb551b37f90cd9f754d9f237624941ea3ce3f571c62b486df690410d1b7f211f6919a25c7a5bb73e25b4 WHIRLPOOL 698738d3b1df6b70d010f1cf57a0683ed71e28fde58da2e13a70eefbf2ce9b4fc103b8598edc0d3ae6d77eddff31a9a19079b1cb99d71a1d3035b68681309b5d
-DIST NVIDIA-Linux-x86_64-260.19.36.run 48081798 SHA256 35a8769585e1f9b426c9c21b5f5898c06251a642ed73e9fb9eea9ab87ef91067 SHA512 4f008c90296f22ba944b30d40138af865c82c17721b17368f6497d9b0c7dab50a8320eff90e6da3a5a592b9b8f9741284bbd6589754ae95d80fd489be9b2d126 WHIRLPOOL e0d399f72aba94c3f242e8c1929dd3174fc8a51aa91349b6bc9694922062dbebca6e077a1f7c382caed22fd0aa8c70754792414cfd5380368be2c75ceaeb3bd1
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia
deleted file mode 100644
index 1fcbef41fc..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia
+++ /dev/null
@@ -1,2 +0,0 @@
-# Has to precede X11's own libraries!
-LDPATH=/opt/nvidia/lib
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch
deleted file mode 100644
index eff06a50d0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh
---- NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh	2010-02-07 22:53:38.000000000 +0100
-+++ NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh	2010-02-07 22:57:10.000000000 +0100
-@@ -82,7 +82,7 @@ build_cflags() {
- 
-     if [ "$OUTPUT" != "$SOURCES" ]; then
-         MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
--        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-         fi
-@@ -91,7 +91,7 @@ build_cflags() {
-         fi
-     else
-         MACH_CFLAGS="-I$HEADERS/asm/mach-default"
--        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-         fi
-@@ -102,7 +102,7 @@ build_cflags() {
- 
-     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS"
- 
--    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-     fi
-     if [ -n "$BUILD_PARAMS" ]; then
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
deleted file mode 100644
index da92b8f080..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -NuarpbB NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh NVIDIA-Linux-x86-256.25/kernel/conftest.sh
---- NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh	2010-05-19 05:38:57.000000000 +0200
-+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh	2010-05-22 02:13:56.000000000 +0200
-@@ -101,7 +101,7 @@ build_cflags() {
- 
-     if [ "$OUTPUT" != "$SOURCES" ]; then
-         MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
--        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-         fi
-@@ -110,7 +110,7 @@ build_cflags() {
-         fi
-     else
-         MACH_CFLAGS="-I$HEADERS/asm/mach-default"
--        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-         fi
-@@ -121,7 +121,7 @@ build_cflags() {
- 
-     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
- 
--    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-     fi
-     if [ -n "$BUILD_PARAMS" ]; then
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch
deleted file mode 100644
index da9933f633..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h
---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h	2002-12-09 21:26:55.000000000 +0100
-+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h	2003-01-30 18:20:23.000000000 +0100
-@@ -39,6 +39,7 @@
- typedef XID GLXPixmap;
- typedef XID GLXDrawable;
- typedef XID GLXPbuffer;
-+typedef XID GLXPbufferSGIX;
- typedef XID GLXWindow;
- typedef XID GLXFBConfigID;
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch
deleted file mode 100644
index e0393e1b9a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- usr/include/GL/gl.g.orig	2004-07-17 19:56:59.789410584 +1000
-+++ usr/include/GL/gl.h	2004-07-17 19:59:08.844791184 +1000
-@@ -66,6 +66,10 @@
- typedef double GLclampd;
- typedef void GLvoid;
- 
-+/* Patching for some better defines in the global system */
-+#ifndef GL_GLEXT_LEGACY
-+#include <GL/glext.h>
-+#endif
- 
- /*************************************************************/
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit
deleted file mode 100644
index 75b39cfbd9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	# libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully
-	if [ -e $2.$3 ] ; then
-		doexe $2.$3
-		dosym ${libname}.$3 $1/${libname}
-		[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit
deleted file mode 100644
index b14df34b10..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit
deleted file mode 100644
index e48d11ce96..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distribnuted under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-#
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir=$(get_libdir)
-
-	if [[ ${#} -eq 2 ]] ; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-		pkglibdir=lib32
-	fi
-
-	local usrpkglibdir=usr/${pkglibdir}
-	local libdir=usr/X11R6/${pkglibdir}
-	local drvdir=${libdir}/modules/drivers
-	local extdir=${libdir}/modules/extensions
-	local incdir=usr/include/GL
-	local sover=${PV}
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
-	local TLS_ROOT="${NV_ROOT}/tls"
-	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
-
-	if use x86-fbsd; then
-		# on FreeBSD everything is on obj/
-		pkglibdir=obj
-		usrpkglibdir=obj
-		x11pkglibdir=obj
-		drvdir=obj
-		extdir=obj
-
-		# don't ask me why the headers are there.. glxext.h is missing
-		incdir=doc
-
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
-
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover}
-
-	dodir ${NO_TLS_ROOT}
-	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
-
-	if ! use x86-fbsd; then
-		donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	if want_tls ; then
-		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
-	else
-		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
-	fi
-
-	if ! use x86-fbsd; then
-		# Install the .la file for libtool, to prevent e.g. bug #176423
-		[ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR"
-		local ver1=$(get_version_component_range 1)
-		local ver2=$(get_version_component_range 2)
-		local ver3=$(get_version_component_range 3)
-		sed -e "s:\${PV}:${PV}:"     \
-			-e "s:\${ver1}:${ver1}:" \
-			-e "s:\${ver2}:${ver2}:" \
-			-e "s:\${ver3}:${ver3}:" \
-			-e "s:\${libdir}:${inslibdir}:" \
-			"${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la
-	fi
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-
-	[[ -f ${drvdir}/nvidia_drv.so ]] && \
-		doexe ${drvdir}/nvidia_drv.so
-
-	insinto /usr/${inslibdir}
-	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
-		doins ${libdir}/libXvMCNVIDIA.a
-	exeinto /usr/${inslibdir}
-	# fix Bug 131315
-	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
-		dosym libXvMCNVIDIA.so.${PV} \
-			/usr/${inslibdir}/libXvMCNVIDIA.so
-
-	exeinto ${NV_ROOT}/extensions
-	[[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \
-		newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so
-	[[ -f ${extdir}/libglx.so.${sover} ]] && \
-		newexe ${extdir}/libglx.so.${sover} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins ${incdir}/*.h
-
-	#cuda
-	if [[ -f usr/include/cuda/cuda.h ]]; then
-		dodir /usr/include/cuda
-		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h
-
-		if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then
-			dolib.so usr/${pkglibdir}/libcuda.so.${PV}
-			dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1
-			dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
-		fi
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit
deleted file mode 100644
index 4debb85d3a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-want_tls() {
-	# For uclibc or anything non glibc, return false
-	has_version sys-libs/glibc || return 1
-
-	# Old versions of glibc were lt/no-tls only
-	has_version '<sys-libs/glibc-2.3.2' && return 1
-
-	if use x86 ; then
-		case ${CHOST/-*} in
-			i486|i586|i686) ;;
-			*) return 1 ;;
-		esac
-	fi
-
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
-	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
-	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
-		case ${CHOST/-*} in
-			i486|i586) return 1 ;;
-		esac
-	fi
-
-	# These versions built linuxthreads version to support tls, too
-	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
-
-	return 1
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2
deleted file mode 100644
index 863d184419..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.${PV} libGL.so.1 libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl'
-
-# Version information for libGL.
-current=${ver1}
-age=${ver2}
-revision=${ver3}
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/${libdir}'
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia
deleted file mode 100644
index 7cf0f7c078..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia
+++ /dev/null
@@ -1,40 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-#   To enable Side Band Adressing:  NVreg_EnableAGPSBA=1
-#
-#   To enable Fast Writes: NVreg_EnableAGPFW=1
-#
-# To enable both for instance, uncomment following line:
-#
-#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1
-# If you have a mobile chip, you may need to enable this option
-# if you have hard lockups when starting X.
-#
-# See: Appendix I. Configuring your laptop
-# In /usr/share/doc/PACKAGE/README for full details
-#
-# Choose the appropriate value for NVreg_Mobile from the table:
-#        Value		Meaning
-#        ----------	--------------------------------------------------
-#        0xFFFFFFFF	let the kernel module autodetect the correct value
-#        1		Dell laptops
-#        2		non-Compal Toshiba laptops
-#        3		all other laptops
-#        4		Compal Toshiba laptops
-#        5		Gateway laptops
-#
-#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3
-
-
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07
deleted file mode 100644
index a96b0cd1e4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07
+++ /dev/null
@@ -1,14 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
deleted file mode 100644
index 75daad33ec..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: usr/src/nv/conftest.sh
-===================================================================
---- usr/src/nv/conftest.sh	
-+++ usr/src/nv/conftest.sh	2010-01-06 12:10:56.000000000 +0530
-@@ -32,14 +32,14 @@
-     # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
-     # the kernel as a stand-alone kernel.
-     #
--    FILE="linux/autoconf.h"
-+    FILE="generated/autoconf.h"
- 
-     if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-         #
-         # We are looking at a configured source tree; verify
-         # that it's not a Xen kernel.
-         #
--        echo "#include <linux/autoconf.h>
-+        echo "#include <generated/autoconf.h>
-         #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
-         #error CONFIG_XEN defined!
-         #endif
-@@ -111,7 +111,12 @@
-     fi
- }
- 
--CONFTEST_PREAMBLE="#include <linux/autoconf.h>
-+CONFTEST_PREAMBLE="#include <linux/version.h>
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+    #include <generated/autoconf.h>
-+    #else
-+    #include <linux/autoconf.h>
-+    #endif
-     #if defined(CONFIG_XEN) && \
-         defined(CONFIG_XEN_INTERFACE_VERSION) &&  !defined(__XEN_INTERFACE_VERSION__)
-     #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
-@@ -1294,7 +1299,7 @@
-                 echo "";
-             fi
-         fi
--        exit $RET
-+#        exit $RET
-     ;;
- 
-     get_uname)
-@@ -1316,11 +1321,11 @@
-             # tree or at headers shipped for a specific kernel.
-             # Determine the kernel version using a compile check.
-             #
--            FILE="linux/utsrelease.h"
-+            FILE="generated/utsrelease.h"
- 
-             if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-                 echo "$CONFTEST_PREAMBLE
--                #include <linux/utsrelease.h>
-+                #include <generated/utsrelease.h>
-                 int main() {
-                     printf(\"%s\", UTS_RELEASE);
-                     return 0;
-@@ -1375,7 +1380,7 @@
-         #
-         RET=1
-         VERBOSE=$6
--        FILE="linux/autoconf.h"
-+        FILE="generated/autoconf.h"
- 
-         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-             #
-@@ -1429,7 +1434,7 @@
-         #
-         RET=1
-         VERBOSE=$6
--        FILE="linux/autoconf.h"
-+        FILE="generated/autoconf.h"
- 
-         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-             #
-Index: usr/src/nv/nvacpi.c
-===================================================================
---- usr/src/nv/nvacpi.c	
-+++ usr/src/nv/nvacpi.c	2010-01-06 12:10:56.000000000 +0530
-@@ -49,6 +49,10 @@
- };
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
-+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
-+#endif
-+
- static struct acpi_driver *nv_acpi_driver;
- static acpi_handle nvif_handle = NULL;
- static acpi_handle dsm_handle  = NULL;
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml
deleted file mode 100644
index 843e746128..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>cardoe@gentoo.org</email>
-  <description>General maintainer and POC with NVIDIA</description>
-</maintainer>
-<maintainer>
-  <email>jer@gentoo.org</email>
-</maintainer>
-<maintainer>
-  <email>spock@gentoo.org</email>
-  <description>Focused on CUDA and new kernel support</description>
-</maintainer>
-<longdescription>NVIDIA X11 driver and GLX libraries</longdescription>
-</pkgmetadata>
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild
deleted file mode 100644
index 97e8a6a943..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild
+++ /dev/null
@@ -1,529 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild,v 1.1 2011/01/24 15:39:30 cardoe Exp $
-
-EAPI="2"
-
-inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-
-DESCRIPTION="NVIDIA X11 driver and GLX libraries"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	 x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi custom-cflags gtk multilib kernel_linux"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-COMMON="<x11-base/xorg-server-1.9.99
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-xlibs )
-	>=app-admin/eselect-opengl-1.0.9
-	!<media-video/nvidia-settings-256.52"
-DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
-RDEPEND="${COMMON}
-	x11-libs/libXvMC
-	kernel_linux? ( virtual/modutils )
-	acpi? ( sys-power/acpid )"
-PDEPEND=">=x11-libs/libvdpau-0.3-r1
-	gtk? ( media-video/nvidia-settings )"
-
-QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/libnvidia-glcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libOpenCL.so.1.0.0
-	usr/lib/libnvidia-compiler.so.${PV}"
-
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
-	usr/lib/opengl/nvidia/lib/libGL.so.1
-	usr/lib/libnvidia-glcore.so.1
-	usr/lib/libnvidia-cfg.so.1
-	usr/lib/opengl/nvidia/extensions/libglx.so.1
-	usr/lib/xorg/modules/drivers/nvidia_drv.so"
-
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libnvidia-glcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/libOpenCL.so.1.0.0
-	usr/lib32/libnvidia-compiler.so.${PV}"
-
-QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/libnvidia-glcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib/libXvMCNVIDIA.a:NVXVMC.o
-	usr/lib/libnvidia-compiler.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libcuda.so.${PV}
-	usr/lib/libOpenCL.so.1.0.0"
-
-QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libnvidia-compiler.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/libOpenCL.so.1.0.0
-	usr/lib64/libnvidia-compiler.so.${PV}
-	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/libvdpau_nvidia.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/libnvidia-glcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
-	usr/lib64/libOpenCL.so.1.0.0
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig
-	usr/bin/nvidia-settings"
-
-QA_WX_LOAD_x86="usr/lib/libnvidia-glcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/libXvMCNVIDIA.a
-	usr/lib64/libXvMCNVIDIA.so.${PV}"
-
-QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libnvidia-glcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/libnvidia-glcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}"
-
-QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}"
-
-QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV}
-	usr/lib32/libnvidia-compiler.so.${PV}"
-
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libnvidia-glcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/libOpenCL.so.1.0.0
-	usr/lib32/libnvidia-compiler.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/libnvidia-glcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/libvdpau_nvidia.so.${PV}
-	usr/lib64/libOpenCL.so.1.0.0
-	usr/lib64/libnvidia-compiler.so.${PV}
-	usr/lib64/libnvcuvid.so.${PV}
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig
-	usr/bin/nvidia-settings"
-
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libnvidia-glcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libOpenCL.so.1.0.0
-	usr/lib/libnvidia-compiler.so.${PV}
-	usr/lib/libnvcuvid.so.${PV}
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig
-	usr/bin/nvidia-settings"
-
-S="${WORKDIR}/"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-lockdep_check() {
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol "
-		eerror "'lockdep_init_map' as GPL-only which will prevent "
-		eerror "${P} from compiling."
-		eerror "Please make sure the following options have been unset:"
-		eerror
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		die "LOCKDEP enabled"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default abi."
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)"
-		mtrr_check
-		lockdep_check
-	fi
-
-	# On BSD userland it wants real make command
-	use userland_BSD && MAKE="$(get_bmake)"
-
-	export _POSIX2_VERSION="199209"
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		NV_DOC="${S}/doc"
-		NV_EXEC="${S}/obj"
-		NV_LIB="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_X11_DRV="${NV_X11}"
-		NV_X11_EXT="${NV_X11}"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_EXEC="${S}"
-		NV_LIB="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_X11_DRV="${NV_X11}"
-		NV_X11_EXT="${NV_X11}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if use kernel_linux && kernel_is lt 2 6 7; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	if ! use x86-fbsd; then
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	use x86-fbsd && cd doc
-
-	if use kernel_linux; then
-		# Quiet down warnings the user does not need to see
-		sed -i \
-			-e 's:-Wsign-compare::g' \
-			"${NV_SRC}"/Makefile.kbuild
-
-		# Add support for the 'x86' unified kernel arch in conftest.sh
-		epatch "${FILESDIR}"/256.35-unified-arch.patch
-
-		# If you set this then it's your own fault when stuff breaks :)
-		use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use x86-fbsd; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "$VIDEOGROUP" ]; then
-			eerror "Failed to determine the video group gid."
-			die "Failed to determine the video group gid."
-		fi
-
-		# Add the aliases
-		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
-		sed -e 's:PACKAGE:'${PF}':g' \
-			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
-			"${WORKDIR}"/nvidia
-		insinto /etc/modprobe.d
-		newins "${WORKDIR}"/nvidia nvidia.conf || die
-	elif use x86-fbsd; then
-		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
-
-		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
-		die "failed to install libnvidia-cfg"
-	dosym /usr/$(get_libdir)/libnvidia-cfg.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libnvidia-cfg.so || \
-		die "failed to create libnvidia-cfg.so symlink"
-
-	# NVIDIA video decode <-> CUDA
-	dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \
-		die "failed to install libnvcuvid.so"
-	dosym /usr/$(get_libdir)/libnvcuvid.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libnvcuvid.so || \
-		die "failed to create libnvcuvid.so symlink"
-
-	# Xorg DDX driver
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"
-
-	# Xorg GLX driver
-	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
-	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
-		die "failed to install libglx.so"
-	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
-		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
-		die "failed to create libglx.so symlink"
-
-	# XvMC driver
-	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-		die "failed to install libXvMCNVIDIA.so"
-	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
-		die "failed to install libXvMCNVIDIA.so"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \
-		die "failed to create libXvMCNVIDIA.so symlink"
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		dodir /etc/OpenCL/vendors
-		insinto /etc/OpenCL/vendors
-		doins nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use x86-fbsd; then
-		dodoc "${NV_DOC}/README"
-		doman "${NV_MAN}/nvidia-xconfig.1"
-		use gtk && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use gtk && doman "${NV_MAN}/nvidia-settings.1.gz"
-	fi
-
-	# Helper Apps
-	dobin ${NV_EXEC}/nvidia-xconfig || die
-	if use gtk; then
-		dobin ${NV_EXEC}/nvidia-settings || die
-	fi
-	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
-	if use kernel_linux; then
-		dobin ${NV_EXEC}/nvidia-smi || die
-	fi
-
-	# Desktop entries for nvidia-settings
-	if use gtk; then
-		sed -e 's:__UTILS_PATH__:/usr/bin:' \
-			-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
-			-i "${NV_EXEC}/nvidia-settings.desktop"
-		domenu ${NV_EXEC}/nvidia-settings.desktop
-
-		doicon ${NV_EXEC}/nvidia-settings.png
-	fi
-
-	if has_multilib_profile ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	doexe $2.$3 || die "failed to install $2"
-	dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2"
-	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local libdir= sover=
-
-	if use kernel_linux; then
-		if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-			libdir=32
-		else
-			libdir=.
-		fi
-		sover=${PV}
-	else
-		libdir=obj
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
-	donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover}
-	if use x86-fbsd; then
-		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
-	else
-		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	# VDPAU
-	donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover}
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover}
-		donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover}
-		donvidia /usr/${inslibdir} ${libdir}/libOpenCL.so 1.0.0
-		dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	# Switch to the nvidia implementation
-	eselect opengl set --use-old nvidia
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This ebuild installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
-	elog
-	elog "NVIDIA has requested that any bug reports submitted have the"
-	elog "output of /usr/bin/nvidia-bug-report.sh included."
-	elog
-	elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
-	elog
-	elog "If you are having resolution problems, try disabling DynamicTwinView."
-	elog
-
-	if ! use gtk; then
-		elog "USE=gtk controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. media-video/nvidia-settings"
-		elog "no longer installs nvidia-settings but only installs the"
-		elog "associated user space libraries."
-	fi
-}
-
-pkg_postrm() {
-	if use kernel_linux; then
-		linux-mod_pkg_postrm
-	fi
-	eselect opengl set --use-old xorg-x11
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild
deleted file mode 100644
index 823713d10e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-CROS_WORKON_COMMIT="6db8cf26b1abd41f0465aa345fb12ddbcde404eb"
-CROS_WORKON_TREE="1a5966915f51a670b1f1bd4fda10ec670b40244b"
-CROS_WORKON_PROJECT="chromiumos/third_party/khronos"
-
-inherit cros-workon
-
-DESCRIPTION="OpenGL|ES headers."
-HOMEPAGE="http://www.khronos.org/opengles/2_X/"
-SRC_URI=""
-LICENSE="SGI-B-2.0"
-SLOT="0"
-KEYWORDS="x86 arm"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-CROS_WORKON_LOCALNAME="khronos"
-
-src_install() {
-	# headers
-	insinto /usr/include/EGL
-	doins "${S}/include/EGL/egl.h"
-	doins "${S}/include/EGL/eglplatform.h"
-	doins "${S}/include/EGL/eglext.h"
-	insinto /usr/include/KHR
-	doins "${S}/include/KHR/khrplatform.h"
-	insinto /usr/include/GLES
-	doins "${S}/include/GLES/gl.h"
-	doins "${S}/include/GLES/glext.h"
-	doins "${S}/include/GLES/glplatform.h"
-	insinto /usr/include/GLES2
-	doins "${S}/include/GLES2/gl2.h"
-	doins "${S}/include/GLES2/gl2ext.h"
-	doins "${S}/include/GLES2/gl2platform.h"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild
deleted file mode 100644
index 99a5beb18b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-CROS_WORKON_PROJECT="chromiumos/third_party/khronos"
-
-inherit cros-workon
-
-DESCRIPTION="OpenGL|ES headers."
-HOMEPAGE="http://www.khronos.org/opengles/2_X/"
-SRC_URI=""
-LICENSE="SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~arm"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-CROS_WORKON_LOCALNAME="khronos"
-
-src_install() {
-	# headers
-	insinto /usr/include/EGL
-	doins "${S}/include/EGL/egl.h"
-	doins "${S}/include/EGL/eglplatform.h"
-	doins "${S}/include/EGL/eglext.h"
-	insinto /usr/include/KHR
-	doins "${S}/include/KHR/khrplatform.h"
-	insinto /usr/include/GLES
-	doins "${S}/include/GLES/gl.h"
-	doins "${S}/include/GLES/glext.h"
-	doins "${S}/include/GLES/glplatform.h"
-	insinto /usr/include/GLES2
-	doins "${S}/include/GLES2/gl2.h"
-	doins "${S}/include/GLES2/gl2ext.h"
-	doins "${S}/include/GLES2/gl2platform.h"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild
deleted file mode 100644
index 51fbaf71df..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_COMMIT="6db8cf26b1abd41f0465aa345fb12ddbcde404eb"
-CROS_WORKON_TREE="1a5966915f51a670b1f1bd4fda10ec670b40244b"
-CROS_WORKON_PROJECT="chromiumos/third_party/khronos"
-
-inherit toolchain-funcs cros-workon
-
-DESCRIPTION="OpenGL|ES mock library"
-HOMEPAGE="http://www.khronos.org/opengles/2_X/"
-SRC_URI=""
-
-LICENSE="SGI-B-2.0"
-SLOT="0"
-KEYWORDS="arm x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-drivers/opengles-headers"
-DEPEND="${RDEPEND}"
-
-CROS_WORKON_LOCALNAME="khronos"
-
-src_compile() {
-	tc-export AR CC CXX LD NM RANLIB
-	scons || die
-}
-
-src_install() {
-	dolib libEGL.so libGLESv2.so
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild
deleted file mode 100644
index e6a1b4792a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_PROJECT="chromiumos/third_party/khronos"
-
-inherit toolchain-funcs cros-workon
-
-DESCRIPTION="OpenGL|ES mock library"
-HOMEPAGE="http://www.khronos.org/opengles/2_X/"
-SRC_URI=""
-
-LICENSE="SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~arm ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-drivers/opengles-headers"
-DEPEND="${RDEPEND}"
-
-CROS_WORKON_LOCALNAME="khronos"
-
-src_compile() {
-	tc-export AR CC CXX LD NM RANLIB
-	scons || die
-}
-
-src_install() {
-	dolib libEGL.so libGLESv2.so
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild
deleted file mode 100644
index 5920fc414b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-CROS_WORKON_COMMIT="d15b481e374f58ad82812b5ec9193307a937cfbe"
-CROS_WORKON_TREE="7d097ae9d618817e2c9a274a07c3ec207a631583"
-CROS_WORKON_PROJECT="chromiumos/platform/touchpad-tests"
-
-XORG_EAUTORECONF="yes"
-BASE_INDIVIDUAL_URI=""
-inherit autotools-utils cros-workon
-
-DESCRIPTION="Chromium OS multitouch driver regression tests."
-CROS_WORKON_LOCALNAME="../platform/touchpad-tests"
-
-KEYWORDS="arm amd64 x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="chromeos-base/gestures
-	chromeos-base/libevdev
-	app-misc/utouch-evemu
-	x11-proto/inputproto"
-
-DEPEND=${RDEPEND}
-
-DOCS=""
-
-src_prepare() {
-	cros-workon_src_prepare
-}
-
-src_configure() {
-	cros-workon_src_configure
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	# install to autotest deps directory for dependency
-	emake DESTDIR="${D}/usr/local/autotest/client/deps/touchpad-tests" install
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild
deleted file mode 100644
index 34583147b9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-CROS_WORKON_PROJECT="chromiumos/platform/touchpad-tests"
-
-XORG_EAUTORECONF="yes"
-BASE_INDIVIDUAL_URI=""
-inherit autotools-utils cros-workon
-
-DESCRIPTION="Chromium OS multitouch driver regression tests."
-CROS_WORKON_LOCALNAME="../platform/touchpad-tests"
-
-KEYWORDS="~arm amd64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="chromeos-base/gestures
-	chromeos-base/libevdev
-	app-misc/utouch-evemu
-	x11-proto/inputproto"
-
-DEPEND=${RDEPEND}
-
-DOCS=""
-
-src_prepare() {
-	cros-workon_src_prepare
-}
-
-src_configure() {
-	cros-workon_src_configure
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	# install to autotest deps directory for dependency
-	emake DESTDIR="${D}/usr/local/autotest/client/deps/touchpad-tests" install
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild
deleted file mode 100644
index 94286cb0bf..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-CROS_WORKON_COMMIT="43e047f66e76514f6ff153724482440bc45a09d2"
-CROS_WORKON_TREE="3b26ecfe0fc8246a9771a6b1539572d0d70e3ad1"
-CROS_WORKON_PROJECT="chromiumos/platform/xf86-input-cmt"
-
-XORG_EAUTORECONF="yes"
-BASE_INDIVIDUAL_URI=""
-inherit autotools-utils cros-workon
-
-DESCRIPTION="Chromium OS multitouch input driver for Xorg X server."
-CROS_WORKON_LOCALNAME="../platform/xf86-input-cmt"
-
-KEYWORDS="arm amd64 x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="chromeos-base/gestures
-	 chromeos-base/libevdev
-	 x11-base/xorg-server"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto"
-
-DOCS="README"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	autotools-utils_src_install
-	remove_libtool_files all
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild
deleted file mode 100644
index 08a7f1a165..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-CROS_WORKON_PROJECT="chromiumos/platform/xf86-input-cmt"
-
-XORG_EAUTORECONF="yes"
-BASE_INDIVIDUAL_URI=""
-inherit autotools-utils cros-workon
-
-DESCRIPTION="Chromium OS multitouch input driver for Xorg X server."
-CROS_WORKON_LOCALNAME="../platform/xf86-input-cmt"
-
-KEYWORDS="~arm ~amd64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="chromeos-base/gestures
-	 chromeos-base/libevdev
-	 x11-base/xorg-server"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto"
-
-DOCS="README"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	autotools-utils_src_install
-	remove_libtool_files all
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest
deleted file mode 100644
index 1ad2d203e1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xf86-input-evdev-2.7.3.tar.bz2 364819 SHA256 eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504 SHA512 edd5691bc6878bb491d7ffb04b35ab60cd70853ae702883c672c53c9f6cb8e81817f94cc03feaaca4e4a02a2a436f1417bd1e1e5f52a151a416fd04306159879 WHIRLPOOL 750605a0efabcb078e65d08b7ea610fdfc4cab49b73a2676247f95f50fcf7d17e80ab2186ef103830865a564dc695f035739f1b88e28f68c981fc703e26610a6
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch
deleted file mode 100644
index 5c1bb2a846..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-From: Ang Pan <oscarpan@chromium.org>
-Date: Thu, 15 Nov 2012 15:38:44 +0800
-Subject: [PATCH] Accelerate wheel scrolling
-
----
- include/evdev-properties.h |    4 +
- src/evdev.c                |  198 +++++++++++++++++++++++++++++++++++++++----
- src/evdev.h                |   13 +++
- 3 files changed, 196 insertions(+), 19 deletions(-)
-
-diff --git a/include/evdev-properties.h b/include/evdev-properties.h
---- a/include/evdev-properties.h
-+++ b/include/evdev-properties.h
-@@ -87,4 +87,8 @@
- */
- #define EVDEV_PROP_FUNCTION_KEYS "Evdev Function Keys"
- 
-+/* Mouse scroll wheel axes acceleration. */
-+/* BOOL */
-+#define EVDEV_PROP_WHEEL_ACCEL_AXES "Evdev Wheel Axes Acceleration"
-+
- #endif
-diff --git a/src/evdev.c b/src/evdev.c
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -99,6 +99,9 @@
- #define ABS_MT_TRACKING_ID 0x39
- #endif
- 
-+#define AXIS_LABEL_PROP_ABS_DBL_START_TIME  "Abs Dbl Start Timestamp"
-+#define AXIS_LABEL_PROP_ABS_DBL_END_TIME    "Abs Dbl End Timestamp"
-+
- static const char *evdevDefaults[] = {
-     "XkbRules",     "evdev",
-     "XkbModel",     "evdev",
-@@ -156,12 +159,17 @@ static Atom prop_axis_label;
- static Atom prop_btn_label;
- static Atom prop_device;
- static Atom prop_virtual;
-+static Atom prop_wheel_accel_axes;
- 
- /* All devices the evdev driver has allocated and knows about.
-  * MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK)
-  * cannot be used by evdev, leaving us with a space of 2 at the end. */
- static EvdevPtr evdev_devices[MAXDEVICES] = {NULL};
- 
-+static double TimevalToDouble(const struct timeval* tv) {
-+    return (double)(tv->tv_sec) + (double)(tv->tv_usec) / 1000000.0;
-+}
-+
- static int EvdevSwitchMode(ClientPtr client, DeviceIntPtr device, int mode)
- {
-     InputInfoPtr pInfo;
-@@ -702,6 +710,103 @@ EvdevProcessButtonEvent(InputInfoPtr pInfo, struct input_event *ev)
-         EvdevQueueKbdEvent(pInfo, ev, value);
- }
- 
-+#ifndef HAVE_SMOOTH_SCROLLING
-+/**
-+ * Normal CDF seems like a good curve to simulate scroll wheel acceleration
-+ * curve. Use following methods to generate the coefficients of a degree-4
-+ * polynomial regression for a specific normal cdf in matlab.
-+ *
-+ * Note: x for click_speed, y for scroll pixels.
-+ * In reality, x ranges from 1 to 120+ for an Apple Mighty Mouse, use range
-+ * greater than that to minimize approximation error at the end points.
-+ * In our case, the range is [-50, 200].
-+ *
-+ * matlab code to generate accel_params below:
-+ * x=[-50:200];
-+ * y=600*normcdf(x,77,40);
-+ * a=polyfit(x,y,4);
-+ */
-+static const double accel_params[] = {
-+    -9.528484576366295e-08,
-+    -1.515738095456648e-04,
-+    3.940238948978762e-02,
-+    1.732410732791920,
-+    4.412651786252371,
-+};
-+
-+/* when x is 155, the polinomial curve gives 600, the max pixels to scroll */
-+static const double max_allowed_click_speed = 155;
-+
-+/**
-+ * Get the number of pixels to scroll, used for axes_scroll.
-+ */
-+static double
-+EvdevGetPixelsToScroll(double click_speed)
-+{
-+    double pixels = 0;
-+    double term = 1;
-+    double allowed_click_speed = fabs(click_speed);
-+    if (allowed_click_speed > max_allowed_click_speed)
-+        allowed_click_speed = max_allowed_click_speed;
-+    int i;
-+    for (i = 1; i <= ArrayLength(accel_params); i++)
-+    {
-+        pixels += term * accel_params[ArrayLength(accel_params) - i];
-+        term *= allowed_click_speed;
-+    }
-+    if (click_speed < 0)
-+        pixels *= -1;
-+    return pixels;
-+}
-+
-+/**
-+ * Mouse scroll acceleration.
-+ */
-+static void
-+EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev)
-+{
-+    double pixels;
-+    double dt; /* seconds */
-+    double click_speed; /* clicks / second */
-+    EvdevPtr pEvdev = pInfo->private;
-+    double start_time;
-+    double end_time = TimevalToDouble(&ev->time);
-+    int map;
-+    EvdevRelWheelPtr wheel = (ev->code == REL_WHEEL) ? &pEvdev->wheel :
-+                                                       &pEvdev->hwheel;
-+
-+    /* Check if this scroll is in same direction as previous scroll event */
-+    if ((wheel->value < 0 && ev->value < 0) ||
-+        (wheel->value > 0 && ev->value > 0)) {
-+        start_time = wheel->time;
-+    } else {
-+        start_time = end_time;
-+    }
-+
-+    /* If start_time == end_time, compute click_speed using dt = 1 second */
-+    dt = (end_time - start_time) ?: 1.0;
-+    click_speed = ev->value / dt;
-+
-+    wheel->value = ev->value;
-+    wheel->time = end_time;
-+
-+    pixels = EvdevGetPixelsToScroll(click_speed);
-+    /* For historical reasons the vertical wheel (REL_WHEEL) is inverted */
-+    pixels *= (ev->code == REL_WHEEL) ? -1 : 1;
-+
-+    valuator_mask_zero(pEvdev->vals);
-+    map = pEvdev->axis_map[ev->code];
-+    valuator_mask_set_double(pEvdev->vals, map, pixels);
-+    if (pEvdev->start_time_valuator_index >= 0)
-+       valuator_mask_set_double(pEvdev->vals,
-+                                pEvdev->start_time_valuator_index, start_time);
-+    if (pEvdev->end_time_valuator_index >= 0)
-+        valuator_mask_set_double(pEvdev->vals,
-+                                 pEvdev->end_time_valuator_index, end_time);
-+    xf86PostMotionEventM(pInfo->dev, TRUE, pEvdev->vals);
-+}
-+#endif
-+
- /**
-  * Take the relative motion input event and process it accordingly.
-  */
-@@ -712,6 +817,14 @@ EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev)
-     EvdevPtr pEvdev = pInfo->private;
-     int map;
- 
-+#ifndef HAVE_SMOOTH_SCROLLING
-+    if (pEvdev->scroll_axes && (ev->code == REL_WHEEL ||
-+                                ev->code == REL_HWHEEL)) {
-+        EvdevAccelWheel(pInfo, ev);
-+        return;
-+    }
-+#endif
-+
-     /* Get the signed value, earlier kernels had this as unsigned */
-     value = ev->value;
- 
-@@ -1894,12 +2007,6 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
-         goto out;
- 
- #ifndef HAVE_SMOOTH_SCROLLING
--    /* Wheels are special, we post them as button events. So let's ignore them
--     * in the axes list too */
--    if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_WHEEL))
--        num_axes--;
--    if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_HWHEEL))
--        num_axes--;
-     if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_DIAL))
-         num_axes--;
- 
-@@ -1907,17 +2014,20 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
-         goto out;
- #endif
- 
--    if (num_axes > MAX_VALUATORS) {
--        xf86IDrvMsg(pInfo, X_WARNING, "found %d axes, limiting to %d.\n", num_axes, MAX_VALUATORS);
--        num_axes = MAX_VALUATORS;
-+    /* -2 to leave room for start and end timestamps */
-+    if (num_axes > MAX_VALUATORS - 2) {
-+        xf86IDrvMsg(pInfo, X_WARNING, "found %d axes, limiting to %d.\n", num_axes, MAX_VALUATORS - 2);
-+        num_axes = MAX_VALUATORS - 2;
-     }
- 
--    pEvdev->num_vals = num_axes;
--    if (num_axes > 0) {
--        pEvdev->vals = valuator_mask_new(num_axes);
--        if (!pEvdev->vals)
--            goto out;
--    }
-+    pEvdev->start_time_valuator_index = num_axes;
-+    pEvdev->end_time_valuator_index = num_axes + 1;
-+
-+    /* +2 for timestamp valuators */
-+    pEvdev->num_vals = num_axes + 2;
-+    pEvdev->vals = valuator_mask_new(pEvdev->num_vals);
-+    if (!pEvdev->vals)
-+        goto out;
-     atoms = malloc(pEvdev->num_vals * sizeof(Atom));
- 
-     for (axis = REL_X; i < MAX_VALUATORS && axis <= REL_MAX; axis++)
-@@ -1925,7 +2035,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
-         pEvdev->axis_map[axis] = -1;
- #ifndef HAVE_SMOOTH_SCROLLING
-         /* We don't post wheel events, so ignore them here too */
--        if (axis == REL_WHEEL || axis == REL_HWHEEL || axis == REL_DIAL)
-+        if (axis == REL_DIAL)
-             continue;
- #endif
-         if (!EvdevBitIsSet(pEvdev->rel_bitmask, axis))
-@@ -1934,9 +2044,20 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
-         i++;
-     }
- 
--    EvdevInitAxesLabels(pEvdev, Relative, pEvdev->num_vals, atoms);
-+    /* Initialize all axis label atoms except Start & End Timestamps */
-+    EvdevInitAxesLabels(pEvdev, Relative, num_axes, atoms);
-+
-+    /* Create atoms for Start & End Timestamps */
-+    atoms[pEvdev->start_time_valuator_index] =
-+        MakeAtom(AXIS_LABEL_PROP_ABS_DBL_START_TIME,
-+                 strlen(AXIS_LABEL_PROP_ABS_DBL_START_TIME),
-+                 TRUE);
-+    atoms[pEvdev->end_time_valuator_index] =
-+        MakeAtom(AXIS_LABEL_PROP_ABS_DBL_END_TIME,
-+                 strlen(AXIS_LABEL_PROP_ABS_DBL_END_TIME),
-+                 TRUE);
- 
--    if (!InitValuatorClassDeviceStruct(device, num_axes, atoms,
-+    if (!InitValuatorClassDeviceStruct(device, pEvdev->num_vals, atoms,
-                                        GetMotionHistorySize(), Relative)) {
-         xf86IDrvMsg(pInfo, X_ERROR, "failed to initialize valuator class device.\n");
-         goto out;
-@@ -1951,11 +2072,18 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
-     for (axis = REL_X; axis <= REL_MAX; axis++)
-     {
-         int axnum = pEvdev->axis_map[axis];
-+        int mode = Relative;
- 
-         if (axnum == -1)
-             continue;
-+
-+#ifndef HAVE_SMOOTH_SCROLLING
-+        if (axis == REL_WHEEL || axis == REL_HWHEEL)
-+            mode = Absolute;
-+#endif
-+
-         xf86InitValuatorAxisStruct(device, axnum, atoms[axnum], -1, -1, 1, 0, 1,
--                                   Relative);
-+                                   mode);
-         xf86InitValuatorDefaults(device, axnum);
- #ifdef HAVE_SMOOTH_SCROLLING
-         if (axis == REL_WHEEL)
-@@ -1967,6 +2095,17 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
- #endif
-     }
- 
-+#ifndef HAVE_SMOOTH_SCROLLING
-+    /* Initialize valuators for scroll wheel Start & End Timestamps */
-+    xf86InitValuatorAxisStruct(device, pEvdev->start_time_valuator_index,
-+                               atoms[pEvdev->start_time_valuator_index],
-+                               0, INT_MAX, 1, 0, 1, Absolute);
-+
-+    xf86InitValuatorAxisStruct(device, pEvdev->end_time_valuator_index,
-+                               atoms[pEvdev->end_time_valuator_index],
-+                               0, INT_MAX, 1, 0, 1, Absolute);
-+#endif
-+
-     free(atoms);
- 
-     return Success;
-@@ -2128,6 +2267,9 @@ EvdevInit(DeviceIntPtr device)
-     for(i = 0; i < max(ABS_CNT,REL_CNT); i++)
-       pEvdev->axis_map[i]=-1;
- 
-+    pEvdev->start_time_valuator_index = -1;
-+    pEvdev->end_time_valuator_index = -1;
-+
-     if (pEvdev->flags & EVDEV_KEYBOARD_EVENTS)
- 	EvdevAddKeyClass(device);
-     if (pEvdev->flags & EVDEV_BUTTON_EVENTS)
-@@ -3218,6 +3360,7 @@ EvdevInitProperty(DeviceIntPtr dev)
-     if (pEvdev->flags & (EVDEV_RELATIVE_EVENTS | EVDEV_ABSOLUTE_EVENTS))
-     {
-         BOOL invert[2];
-+        int axis_accel_conf_val;
-         invert[0] = pEvdev->invert_x;
-         invert[1] = pEvdev->invert_y;
- 
-@@ -3264,6 +3407,16 @@ EvdevInitProperty(DeviceIntPtr dev)
- 
-         XISetDevicePropertyDeletable(dev, prop_swap, FALSE);
- 
-+        prop_wheel_accel_axes = MakeAtom(EVDEV_PROP_WHEEL_ACCEL_AXES,
-+                strlen(EVDEV_PROP_WHEEL_ACCEL_AXES), TRUE);
-+        axis_accel_conf_val = xf86SetBoolOption(pInfo->options, EVDEV_PROP_WHEEL_ACCEL_AXES, 0);
-+        pEvdev->scroll_axes = axis_accel_conf_val != 0;
-+        rc = XIChangeDeviceProperty(dev, prop_wheel_accel_axes, XA_INTEGER, 8,
-+                PropModeReplace, 1, &pEvdev->scroll_axes, FALSE);
-+        if (rc != Success)
-+            return;
-+
-+        XISetDevicePropertyDeletable(dev, prop_wheel_accel_axes, FALSE);
-         /* Axis labelling */
-         if ((pEvdev->num_vals > 0) && (prop_axis_label = XIGetKnownProperty(AXIS_LABEL_PROP)))
-         {
-@@ -3333,6 +3486,13 @@ EvdevSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
- 
-         if (!checkonly)
-             pEvdev->swap_axes = *((BOOL*)val->data);
-+    } else if (atom == prop_wheel_accel_axes)
-+    {
-+        if (val->format != 8 || val->type != XA_INTEGER || val->size != 1)
-+            return BadMatch;
-+
-+        if (!checkonly)
-+            pEvdev->scroll_axes = *((BOOL*)val->data);
-     } else if (atom == prop_axis_label || atom == prop_btn_label ||
-                atom == prop_product_id || atom == prop_device ||
-                atom == prop_virtual)
-diff --git a/src/evdev.h b/src/evdev.h
---- a/src/evdev.h
-+++ b/src/evdev.h
-@@ -155,6 +155,12 @@ typedef struct {
- #endif
- } EventQueueRec, *EventQueuePtr;
- 
-+/* Mouse scroll wheel state for one axis (REL_WHEEL or REL_WHEEL) */
-+typedef struct {
-+    int value;              /* last scroll wheel value */
-+    double time;            /* evdev timestamp of last scroll event */
-+} EvdevRelWheelRec, *EvdevRelWheelPtr;
-+
- typedef struct {
-     unsigned short id_vendor;
-     unsigned short id_product;
-@@ -252,6 +258,9 @@ typedef struct {
-     unsigned long led_bitmask[NLONGS(LED_CNT)];
-     struct input_absinfo absinfo[ABS_CNT];
- 
-+    int start_time_valuator_index;
-+    int end_time_valuator_index;
-+
-     /* minor/major number */
-     dev_t min_maj;
- 
-@@ -266,6 +275,10 @@ typedef struct {
-     struct timeval before_sync_time;
-     struct timeval after_sync_time;
-     int32_t cached_tid[MAX_SLOT_COUNT];
-+
-+    BOOL                    scroll_axes;
-+    EvdevRelWheelRec        wheel;       /* scroll state for REL_WHEEL */
-+    EvdevRelWheelRec        hwheel;      /* scroll state for REL_HWHEEL */
- } EvdevRec, *EvdevPtr;
- 
- typedef struct {
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch
deleted file mode 100644
index 083a6fecef..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Yufeng Shen <miletus@chromium.org>
-Date: Mon, 20 Aug 2012 14:55:57 -0400
-Subject: [PATCH] x11-drivers/xf86-input-evdev: Use monotonic timestamps for
- input events
-
-This patch adds the support for xf86-input-evdev to turn on monotonic
-timestamps if kernel supports it.
-
-The clock source is set in EvdevOn() instead of EvdevCache() because the
-latter is only called once when X registers the input device fd with kernel,
-and if later X closes and reopens the input device fd (e.g. when the
-system goes through suspend/resume cycle), the clock source setting
-will be lost. EvdevOn() is the right place to set clock source since
-it is called whenever X wants to open the input device and use it.
-
-BUG=chrome-os-partner:12187
-TEST=On Link, grep "time stamps" /var/log/Xorg.0.log
-     Make sure monotonic timestamp is used for evdev
-     Run "xinput test-xi2" and move fingers on touch device
-     Note that valuator 4 (Touch Timestamp) is using
-     monotonic timestamp.
-     Suspend and resume the device and make sure the timestamp
-     does not change back to real world timestamp.
----
- src/evdev.c |   16 ++++++++++++++++
- src/evdev.h |    1 +
- 2 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -42,6 +42,7 @@
- #include <unistd.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <time.h>
- 
- #include <xf86.h>
- #include <xf86Xinput.h>
-@@ -61,6 +62,11 @@
- #define XI_PROP_VIRTUAL_DEVICE "Virtual Device"
- #endif
- 
-+/* Set clockid to be used for timestamps */
-+#ifndef EVIOCSCLOCKID
-+#define EVIOCSCLOCKID  _IOW('E', 0xa0, int)
-+#endif
-+
- /* removed from server, purge when dropping support for server 1.10 */
- #define XI86_SEND_DRAG_EVENTS   0x08
- 
-@@ -1809,6 +1815,12 @@ EvdevInit(DeviceIntPtr device)
-     return Success;
- }
- 
-+static int
-+EvdevEnableMonotonic(InputInfoPtr pInfo) {
-+    unsigned int clk = CLOCK_MONOTONIC;
-+    return (ioctl(pInfo->fd, EVIOCSCLOCKID, &clk) == 0) ? Success : !Success;
-+}
-+
- /**
-  * Init all extras (wheel emulation, etc.) and grab the device.
-  */
-@@ -1826,6 +1838,10 @@ EvdevOn(DeviceIntPtr device)
-     if (rc != Success)
-         return rc;
- 
-+    pEvdev->is_monotonic = (EvdevEnableMonotonic(pInfo) == Success);
-+    xf86IDrvMsg(pInfo, X_PROBED, "Using %s input event time stamps\n",
-+                pEvdev->is_monotonic ? "monotonic" : "realtime");
-+
-     EvdevGrabDevice(pInfo, 1, 0);
- 
-     xf86FlushInput(pInfo->fd);
-diff --git a/src/evdev.h b/src/evdev.h
---- a/src/evdev.h
-+++ b/src/evdev.h
-@@ -173,6 +173,7 @@ typedef struct {
-     BOOL swap_axes;
-     BOOL invert_x;
-     BOOL invert_y;
-+    BOOL is_monotonic;
- 
-     int delta[REL_CNT];
-     unsigned int abs_queued, rel_queued, prox_queued;
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch
deleted file mode 100644
index 36100440c8..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From: Chung-yih Wang <cywang@chromium.org>
-Date: Thu, 6 Dec 2012 17:43:04 +0800
-Subject: [PATCH] Add block reading support
-
-    This patch adds a new xinput property "Block Event Reading" that blocks
-    event reading by skipping read() calls in ReadInput() in order to
-    generate the SYN_DROPPED event for testing the SYN_DROPPED handling.
----
- src/debug.c |   37 +++++++++++++++++++++++++++++++++++++
- src/evdev.c |    6 +++++-
- src/evdev.h |    6 ++++++
- 3 files changed, 48 insertions(+), 1 deletions(-)
-
-diff --git a/src/debug.c b/src/debug.c
---- a/src/debug.c
-+++ b/src/debug.c
-@@ -19,10 +19,12 @@
- #include <xf86Xinput.h>
- #include <X11/Xatom.h>
- 
-+#define XI_PROP_BLOCK_READ_INPUT "Block Event Reading"
- #define XI_PROP_DUMP_DEBUG_LOG "Dump Debug Log"
- 
- #define INPUT_EVENTS_LOG_FILE "/var/log/evdev_input_events.dat"
- 
-+static Atom block_read_prop;
- static Atom dump_debug_log_prop;
- 
- static void
-@@ -112,3 +114,38 @@ EvdevDebugInitProperty(DeviceIntPtr dev)
-     XIRegisterPropertyHandler(dev, EvdevDebugSetProperty,
-         EvdevDebugGetProperty, NULL);
- }
-+
-+static int
-+EvdevBlockSetProperty(DeviceIntPtr dev, Atom atom,
-+                      XIPropertyValuePtr val, BOOL checkonly)
-+{
-+    InputInfoPtr pInfo = dev->public.devicePrivate;
-+    EvdevPtr pEvdev = pInfo->private;
-+
-+    if (atom == block_read_prop) {
-+        if (val->type != XA_INTEGER || val->format != 8 || val->size != 1)
-+            return BadMatch;
-+
-+        if (!checkonly)
-+            pEvdev->block_input = *(BOOL *)val->data;
-+    }
-+    return Success;
-+}
-+
-+void
-+EvdevBlockInitProperty(DeviceIntPtr dev)
-+{
-+    InputInfoPtr pInfo = dev->public.devicePrivate;
-+    EvdevPtr pEvdev = pInfo->private;
-+
-+    block_read_prop = MakeAtom(XI_PROP_BLOCK_READ_INPUT,
-+        strlen(XI_PROP_BLOCK_READ_INPUT), TRUE);
-+
-+    pEvdev->block_input = FALSE;
-+
-+    XIChangeDeviceProperty(dev, block_read_prop, XA_INTEGER,
-+        /* format */ 8, PropModeReplace, /* size */ 1,
-+        &pEvdev->block_input, FALSE);
-+    XISetDevicePropertyDeletable(dev, block_read_prop, FALSE);
-+    XIRegisterPropertyHandler(dev, EvdevBlockSetProperty, NULL, NULL);
-+}
-diff --git a/src/evdev.c b/src/evdev.c
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -1569,11 +1569,14 @@ EvdevReadInput(InputInfoPtr pInfo)
-     struct input_event ev[NUM_EVENTS];
-     int i, len = sizeof(ev);
-     BOOL sync_evdev_state = FALSE;
-+    EvdevPtr pEvdev = pInfo->private;
-+
-+    if (pEvdev->block_input)
-+        return;
- 
-     while (len == sizeof(ev))
-     {
- #ifdef MULTITOUCH
--        EvdevPtr pEvdev = pInfo->private;
- 
-         if (pEvdev->mtdev)
-             len = mtdev_get(pEvdev->mtdev, pInfo->fd, ev, NUM_EVENTS) *
-@@ -2361,6 +2364,7 @@ EvdevInit(DeviceIntPtr device)
-     EvdevDragLockInitProperty(device);
-     EvdevAppleInitProperty(device);
-     EvdevDebugInitProperty(device);
-+    EvdevBlockInitProperty(device);
- 
-     return Success;
- }
-diff --git a/src/evdev.h b/src/evdev.h
---- a/src/evdev.h
-+++ b/src/evdev.h
-@@ -291,6 +291,8 @@ typedef struct {
-     BOOL                    scroll_axes;
-     EvdevRelWheelRec        wheel;       /* scroll state for REL_WHEEL */
-     EvdevRelWheelRec        hwheel;      /* scroll state for REL_HWHEEL */
-+
-+    BOOL                    block_input; /* block read for SYN_DROPPED test */
- } EvdevRec, *EvdevPtr;
- 
- typedef struct {
-@@ -352,5 +354,9 @@ void Evdev3BEmuInitProperty(DeviceIntPtr);
- void EvdevWheelEmuInitProperty(DeviceIntPtr);
- void EvdevDragLockInitProperty(DeviceIntPtr);
- void EvdevAppleInitProperty(DeviceIntPtr);
-+
-+/* For debugging and testing */
- void EvdevDebugInitProperty(DeviceIntPtr);
-+void EvdevBlockInitProperty(DeviceIntPtr);
-+
- #endif
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch
deleted file mode 100644
index cb652196c0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From: Yufeng Shen <miletus@chromium.org>
-Date: Wed, 7 Mar 2012 20:39:09 +1000
-Subject: [PATCH] x11-drivers/xf86-input-evdev: Add kernel timestamp to touch
- events
-
-This CL passes kernel timestamp for touch events to X (hence Chrome)
-as a valuator named "Touch Timestamp". The timestamp for all the X
-touch events generated within one evdev sync report is set to be the
-same as the last EV_SYN event's timestamp.
-
-BUG=chrome-os-partner:12187
-TEST=Run "xinput list 12" on Link and see something like
-	Class originated from: 12. Type: XIValuatorClass
-	Detail for Valuator 4:
-	  Label: Touch Timestamp
-	  Range: 0.000000 - 2147483647.000000
-	  Resolution: 1 units/m
-	  Mode: absolute
-	  Current value: 0.000000
-TEST=Run "xinput test-xi2" on Link and check that for each
-     touch event there is timestamp at the correct valuator:
-  EVENT type 6 (Motion)
-    device: 12 (12)
-    detail: 0
-    flags: emulated
-    ...
-    valuators:
-        0: 135.95
-        1: 116.93
-        2: 18.00
-        3: 100.00
-        4: 1348803480.46   <- Touch Timestamp
-  EVENT type 18 (TouchBegin)
-    device: 12 (12)
-    detail: 1
-    valuators:
-        0: 135.95
-        1: 116.93
-        2: 18.00
-        3: 100.00
-        4: 1348803480.46   <- Touch Timestamp
-TEST=Run "xinput test-xi2" on Link and check that for non-touch events
-     (ie USB mouse) there is no Touch Timestamp:
-  EVENT type 6 (Motion)
-      device: 2 (13)
-      ...
-      valuators:
-          0: 1.19
----
- src/evdev.c |   47 ++++++++++++++++++++++++++++++++++++++++++-----
- src/evdev.h |    4 ++++
- 2 files changed, 46 insertions(+), 5 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -102,6 +102,8 @@
- #define AXIS_LABEL_PROP_ABS_DBL_START_TIME  "Abs Dbl Start Timestamp"
- #define AXIS_LABEL_PROP_ABS_DBL_END_TIME    "Abs Dbl End Timestamp"
- 
-+#define AXIS_LABEL_PROP_TOUCH_TIME   "Touch Timestamp"
-+
- static const char *evdevDefaults[] = {
-     "XkbRules",     "evdev",
-     "XkbModel",     "evdev",
-@@ -1097,7 +1099,7 @@ EvdevPostProximityEvents(InputInfoPtr pInfo, int which, int num_v, int first_v,
-  * Post the queued key/button events.
-  */
- static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v,
--                                  int v[MAX_VALUATORS])
-+                                  int v[MAX_VALUATORS], struct input_event *ev)
- {
-     int i;
-     EvdevPtr pEvdev = pInfo->private;
-@@ -1127,6 +1129,10 @@ static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v,
-             break;
- #ifdef MULTITOUCH
-         case EV_QUEUE_TOUCH:
-+          if (pEvdev->touch_time_valuator_index >= 0)
-+            valuator_mask_set_double(pEvdev->queue[i].touchMask,
-+                                     pEvdev->touch_time_valuator_index,
-+                                     TimevalToDouble(&ev->time));
-             xf86PostTouchEvent(pInfo->dev, pEvdev->queue[i].detail.touch,
-                                pEvdev->queue[i].val, 0,
-                                pEvdev->queue[i].touchMask);
-@@ -1161,7 +1167,7 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev)
-     EvdevPostProximityEvents(pInfo, TRUE, num_v, first_v, v);
-     EvdevPostRelativeMotionEvents(pInfo, num_v, first_v, v);
-     EvdevPostAbsoluteMotionEvents(pInfo, num_v, first_v, v);
--    EvdevPostQueuedEvents(pInfo, num_v, first_v, v);
-+    EvdevPostQueuedEvents(pInfo, num_v, first_v, v, ev);
-     EvdevPostProximityEvents(pInfo, FALSE, num_v, first_v, v);
- 
-     memset(pEvdev->delta, 0, sizeof(pEvdev->delta));
-@@ -1723,6 +1729,8 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
-     int num_mt_axes = 0, /* number of MT-only axes */
-         num_mt_axes_total = 0; /* total number of MT axes, including
-                                   double-counted ones, excluding blacklisted */
-+    int num_ts_vals = 0; /* number of Timestamp valuators */
-+    int num_valuators;
-     Atom *atoms;
- 
-     pInfo = device->public.devicePrivate;
-@@ -1785,6 +1793,9 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
-     }
- #ifdef MULTITOUCH
-     if (num_mt_axes_total > 0) {
-+        /* A Touch Timestamp is only appended to Touch events */
-+        num_ts_vals = 1;
-+
-         pEvdev->num_mt_vals = num_mt_axes_total;
-         pEvdev->mt_mask = valuator_mask_new(num_mt_axes_total);
-         if (!pEvdev->mt_mask) {
-@@ -1813,8 +1824,9 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
-         }
- 
-         for (i = 0; i < EVDEV_MAXQUEUE; i++) {
-+            /* Touch Timestamp is appended directly to the touchMask */
-             pEvdev->queue[i].touchMask =
--                valuator_mask_new(num_mt_axes_total);
-+                valuator_mask_new(num_mt_axes_total + 1);
-             if (!pEvdev->queue[i].touchMask) {
-                 xf86Msg(X_ERROR, "%s: failed to allocate MT valuator masks for "
-                         "evdev event queue.\n", device->name);
-@@ -1823,7 +1835,10 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
-         }
-     }
- #endif
--    atoms = malloc((pEvdev->num_vals + num_mt_axes) * sizeof(Atom));
-+
-+    num_valuators = num_axes + num_mt_axes + num_ts_vals;
-+
-+    atoms = malloc(num_valuators * sizeof(Atom));
- 
-     i = 0;
-     for (axis = ABS_X; i < MAX_VALUATORS && axis <= ABS_MAX; axis++) {
-@@ -1853,9 +1868,22 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
-             i++;
-     }
- 
-+    /* Note: touch timestamp, if present, is initialized separately */
-     EvdevInitAxesLabels(pEvdev, Absolute, pEvdev->num_vals + num_mt_axes, atoms);
- 
--    if (!InitValuatorClassDeviceStruct(device, num_axes + num_mt_axes, atoms,
-+#ifdef MULTITOUCH
-+    if (num_ts_vals > 0) {
-+        /* Manually setup the atom for Touch Timestamp since it did not happen
-+         * in EvdevInitAxesLabels().  It will always be the last valuator. */
-+        pEvdev->touch_time_valuator_index = num_valuators - 1;
-+        atoms[pEvdev->touch_time_valuator_index] =
-+                        MakeAtom(AXIS_LABEL_PROP_TOUCH_TIME,
-+                                 strlen(AXIS_LABEL_PROP_TOUCH_TIME),
-+                                 TRUE);
-+    }
-+#endif
-+
-+    if (!InitValuatorClassDeviceStruct(device, num_valuators, atoms,
-                                        GetMotionHistorySize(), Absolute)) {
-         xf86IDrvMsg(pInfo, X_ERROR, "failed to initialize valuator class device.\n");
-         goto out;
-@@ -1945,6 +1973,14 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
-                                    resolution, 0, resolution,
-                                    Absolute);
-     }
-+
-+    /* Manually configure touch_time axis */
-+    if (num_ts_vals > 0) {
-+        xf86InitValuatorAxisStruct(device, pEvdev->touch_time_valuator_index,
-+                                   atoms[pEvdev->touch_time_valuator_index],
-+                                   0, INT_MAX, 1, 0, 1, Absolute);
-+    }
-+
- #endif
- 
-     free(atoms);
-@@ -2279,6 +2315,7 @@ EvdevInit(DeviceIntPtr device)
- 
-     pEvdev->start_time_valuator_index = -1;
-     pEvdev->end_time_valuator_index = -1;
-+    pEvdev->touch_time_valuator_index = -1;
- 
-     if (pEvdev->flags & EVDEV_KEYBOARD_EVENTS)
- 	EvdevAddKeyClass(device);
-diff --git a/src/evdev.h b/src/evdev.h
---- a/src/evdev.h
-+++ b/src/evdev.h
-@@ -260,6 +260,10 @@ typedef struct {
-     unsigned long led_bitmask[NLONGS(LED_CNT)];
-     struct input_absinfo absinfo[ABS_CNT];
- 
-+    /* touch_time_valuator_index is the index for the "Touch Timestamp"
-+     * property in the device valuator array. We will set it to be the
-+     * last valuator in EvdevAddAbsValuatorClass(); */
-+    int touch_time_valuator_index;
-     int start_time_valuator_index;
-     int end_time_valuator_index;
- 
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch
deleted file mode 100644
index 0160cba5ff..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From: Michael Spang <spang@google.com>
-Date: Mon, 13 Aug 2012 11:35:32 -0400
-Subject: [PATCH] Add events debug log support
-
-This adds a new xinput property "Dump Debug Logs" that dumps the last
-64k input events to /var/log/evdev_input_events.dat.
----
- src/Makefile.am |    3 +-
- src/debug.c     |  114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/evdev.c     |   13 ++++++-
- src/evdev.h     |   11 +++++
- 4 files changed, 139 insertions(+), 2 deletions(-)
- create mode 100644 src/debug.c
-
-diff --git a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -39,5 +39,6 @@ AM_CPPFLAGS =-I$(top_srcdir)/include
-                                emuThird.c \
-                                emuWheel.c \
-                                draglock.c \
--                               apple.c
-+                               apple.c \
-+                               debug.c
- 
-diff --git a/src/debug.c b/src/debug.c
-new file mode 100644
---- /dev/null
-+++ b/src/debug.c
-@@ -0,0 +1,114 @@
-+// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <evdev.h>
-+#include <evdev-properties.h>
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+
-+#include <exevents.h>
-+#include <xf86.h>
-+#include <xf86Xinput.h>
-+#include <X11/Xatom.h>
-+
-+#define XI_PROP_DUMP_DEBUG_LOG "Dump Debug Log"
-+
-+#define INPUT_EVENTS_LOG_FILE "/var/log/evdev_input_events.dat"
-+
-+static Atom dump_debug_log_prop;
-+
-+static void
-+EvdevDumpLog(InputInfoPtr pInfo) {
-+    EvdevPtr pEvdev = pInfo->private;
-+    int i;
-+
-+    FILE *fp = fopen(INPUT_EVENTS_LOG_FILE, "w");
-+    if (!fp) {
-+        xf86IDrvMsg(pInfo, X_ERROR, "fopen: %s: %s\n",
-+            INPUT_EVENTS_LOG_FILE, strerror(errno));
-+        return;
-+    }
-+
-+    fprintf(fp, "# device: %s\n", pInfo->name);
-+
-+    for (i = ABS_X; i <= ABS_MAX; i++) {
-+        if (EvdevBitIsSet(pEvdev->abs_bitmask, i)) {
-+            fprintf(fp, "# absinfo: %d %d %d %d %d %d\n",
-+                /* event code (axis) */ i,
-+                pEvdev->absinfo[i].minimum,
-+                pEvdev->absinfo[i].maximum,
-+                pEvdev->absinfo[i].fuzz,
-+                pEvdev->absinfo[i].flat,
-+                pEvdev->absinfo[i].resolution);
-+        }
-+    }
-+
-+    for (i = 0; i < DEBUG_BUF_SIZE; ++i) {
-+        struct debug_event *de =
-+            &pEvdev->debug_buf[(pEvdev->debug_buf_tail + i) % DEBUG_BUF_SIZE];
-+        if (de->ev.time.tv_sec == 0 && de->ev.time.tv_usec == 0)
-+            continue;
-+        fprintf(fp, "E: %ld.%06ld %04x %04x %d %d\n",
-+            de->ev.time.tv_sec,
-+            de->ev.time.tv_usec,
-+            de->ev.type,
-+            de->ev.code,
-+            de->ev.value,
-+            de->slot);
-+    }
-+
-+    fclose(fp);
-+}
-+
-+static int
-+EvdevDebugGetProperty(DeviceIntPtr dev, Atom property)
-+{
-+    return Success;
-+}
-+
-+static int
-+EvdevDebugSetProperty(DeviceIntPtr dev, Atom atom,
-+                      XIPropertyValuePtr val, BOOL checkonly)
-+{
-+    InputInfoPtr pInfo = dev->public.devicePrivate;
-+    CARD32 data;
-+
-+    if (atom == dump_debug_log_prop) {
-+        if (val->type != XA_INTEGER || val->format != 32 || val->size != 1)
-+            return BadMatch;
-+
-+        data = *(CARD32 *)val->data;
-+
-+        if (data != 1)
-+            return BadValue;
-+
-+        if (!checkonly)
-+            EvdevDumpLog(pInfo);
-+    }
-+
-+    return Success;
-+}
-+
-+void
-+EvdevDebugInitProperty(DeviceIntPtr dev)
-+{
-+
-+    dump_debug_log_prop = MakeAtom(XI_PROP_DUMP_DEBUG_LOG,
-+        strlen(XI_PROP_DUMP_DEBUG_LOG), TRUE);
-+    CARD32 prop_dump_debug_log_init = 0;
-+
-+    XIChangeDeviceProperty(dev, dump_debug_log_prop, XA_INTEGER,
-+        /* format */ 32, PropModeReplace, /* size */ 1,
-+        &prop_dump_debug_log_init, FALSE);
-+    XISetDevicePropertyDeletable(dev, dump_debug_log_prop, FALSE);
-+    XIRegisterPropertyHandler(dev, EvdevDebugSetProperty,
-+        EvdevDebugGetProperty, NULL);
-+}
-diff --git a/src/evdev.c b/src/evdev.c
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -219,7 +219,7 @@ static size_t EvdevCountBits(unsigned long *array, size_t nlongs)
-     return count;
- }
- 
--static inline int EvdevBitIsSet(const unsigned long *array, int bit)
-+inline int EvdevBitIsSet(const unsigned long *array, int bit)
- {
-     return !!(array[bit / LONG_BITS] & (1LL << (bit % LONG_BITS)));
- }
-@@ -1208,6 +1208,16 @@ EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev)
-             syn_dropped = EvdevProcessSyncEvent(pInfo, ev);
-             break;
-     }
-+
-+    // Add touch events to the debug log. Keypresses are not included.
-+    if (ev->type == EV_ABS || ev->type == EV_SYN ||
-+        (ev->type == EV_KEY && ev->code == BTN_TOUCH)) {
-+      EvdevPtr pEvdev = pInfo->private;
-+      pEvdev->debug_buf[pEvdev->debug_buf_tail].ev = *ev;
-+      pEvdev->debug_buf[pEvdev->debug_buf_tail].slot = pEvdev->cur_slot;
-+      pEvdev->debug_buf_tail++;
-+      pEvdev->debug_buf_tail %= DEBUG_BUF_SIZE;
-+    }
-     return syn_dropped;
- }
- 
-@@ -2308,6 +2318,7 @@ EvdevInit(DeviceIntPtr device)
-     EvdevWheelEmuInitProperty(device);
-     EvdevDragLockInitProperty(device);
-     EvdevAppleInitProperty(device);
-+    EvdevDebugInitProperty(device);
- 
-     return Success;
- }
-diff --git a/src/evdev.h b/src/evdev.h
---- a/src/evdev.h
-+++ b/src/evdev.h
-@@ -101,6 +101,8 @@
- /* Number of longs needed to hold the given number of bits */
- #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
- 
-+#define DEBUG_BUF_SIZE 65536
-+
- #define _ABS_MT_FIRST       ABS_MT_TOUCH_MAJOR
- #define _ABS_MT_LAST        ABS_MT_DISTANCE
- #define _ABS_MT_CNT         (_ABS_MT_LAST - _ABS_MT_FIRST + 1)
-@@ -268,6 +270,12 @@ typedef struct {
-     int                     num_queue;
-     EventQueueRec           queue[EVDEV_MAXQUEUE];
- 
-+    struct debug_event {
-+      struct input_event ev;
-+      int slot;
-+    } debug_buf[DEBUG_BUF_SIZE];
-+    size_t debug_buf_tail;
-+
-     enum fkeymode           fkeymode;
- 
-     /* Sync timestamps */
-@@ -329,9 +337,12 @@ BOOL EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv);
- void EvdevDragLockPreInit(InputInfoPtr pInfo);
- BOOL EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value);
- 
-+int EvdevBitIsSet(const unsigned long *array, int bit);
-+
- void EvdevMBEmuInitProperty(DeviceIntPtr);
- void Evdev3BEmuInitProperty(DeviceIntPtr);
- void EvdevWheelEmuInitProperty(DeviceIntPtr);
- void EvdevDragLockInitProperty(DeviceIntPtr);
- void EvdevAppleInitProperty(DeviceIntPtr);
-+void EvdevDebugInitProperty(DeviceIntPtr);
- #endif
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch
deleted file mode 100644
index 7d0c107715..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From: Chung-yih Wang <cywang@chromium.org>
-Date: Wed, 14 Nov 2012 15:42:36 +0800
-Subject: [PATCH] Accelerate emulated wheel events
-
-Use the Chromium OS Mouse Wheel acceleration for Emulated Wheel
-events.  This acceleration replaces the simpler "accumulated inertia
-mapped to number of button clicks" approach.
-
-The main motivation of this change is to send Emulated Wheel events to
-Chrome using the scroll valuators instead of legacy button events.
----
- src/emuWheel.c |   48 +++++++++---------------------------------------
- src/evdev.c    |   20 +++++++++++++++++++-
- src/evdev.h    |    4 ++++
- 3 files changed, 32 insertions(+), 40 deletions(-)
-
-diff --git a/src/emuWheel.c b/src/emuWheel.c
---- a/src/emuWheel.c
-+++ b/src/emuWheel.c
-@@ -50,9 +50,6 @@ static Atom prop_wheel_inertia  = 0;
- static Atom prop_wheel_timeout  = 0;
- static Atom prop_wheel_button   = 0;
- 
--/* Local Funciton Prototypes */
--static int EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value);
--
- /* Filter mouse button events */
- BOOL
- EvdevWheelEmuFilterButton(InputInfoPtr pInfo, unsigned int button, int value)
-@@ -148,8 +145,15 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv)
- 	 */
- 	if (pAxis)
- 	{
--	    if (EvdevWheelEmuInertia(pInfo, pAxis, value))
--		pOtherAxis->traveled_distance = 0;
-+	    if (pAxis->up_button) {
-+		/*
-+		 * Try to emit an emulated wheel event. For REL_Y, up is -
-+		 * and down is + but, for REL_WHEEL, up is + and down is -.
-+		 */
-+		pEv->code = (pEv->code == REL_Y) ? REL_WHEEL : REL_HWHEEL;
-+		pEv->value *= (pEv->code == REL_WHEEL) ? -1 : 1;
-+		EvdevProcessRelativeMotionEvent(pInfo, pEv);
-+	    }
- 	}
- 
- 	/* Eat motion events while emulateWheel button pressed. */
-@@ -159,40 +163,6 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv)
-     return FALSE;
- }
- 
--/* Simulate inertia for our emulated mouse wheel.
--   Returns the number of wheel events generated.
-- */
--static int
--EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value)
--{
--    EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
--    int button;
--    int inertia;
--    int rc = 0;
--
--    /* if this axis has not been configured, just eat the motion */
--    if (!axis->up_button)
--	return rc;
--
--    axis->traveled_distance += value;
--
--    if (axis->traveled_distance < 0) {
--	button = axis->up_button;
--	inertia = -pEvdev->emulateWheel.inertia;
--    } else {
--	button = axis->down_button;
--	inertia = pEvdev->emulateWheel.inertia;
--    }
--
--    /* Produce button press events for wheel motion */
--    while(abs(axis->traveled_distance) > pEvdev->emulateWheel.inertia) {
--	axis->traveled_distance -= inertia;
--	EvdevQueueButtonClicks(pInfo, button, 1);
--	rc++;
--    }
--    return rc;
--}
--
- /* Handle button mapping here to avoid code duplication,
- returns true if a button mapping was found. */
- static BOOL
-diff --git a/src/evdev.c b/src/evdev.c
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -131,6 +131,7 @@ static BOOL EvdevGrabDevice(InputInfoPtr pInfo, int grab, int ungrab);
- static void EvdevSetCalibration(InputInfoPtr pInfo, int num_calibration, int calibration[4]);
- static int EvdevOpenDevice(InputInfoPtr pInfo);
- static void EvdevCloseDevice(InputInfoPtr pInfo);
-+static void EvdevForceWheel(InputInfoPtr pInfo);
- 
- static int EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type,
-                             uint16_t code, int32_t value);
-@@ -787,6 +788,8 @@ EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev)
- 
-     /* If start_time == end_time, compute click_speed using dt = 1 second */
-     dt = (end_time - start_time) ?: 1.0;
-+    if (pEvdev->emulateWheel.enabled)
-+        dt *= pEvdev->emulateWheel.inertia;
-     click_speed = ev->value / dt;
- 
-     wheel->value = ev->value;
-@@ -812,7 +815,7 @@ EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev)
- /**
-  * Take the relative motion input event and process it accordingly.
-  */
--static void
-+void
- EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev)
- {
-     int value;
-@@ -2048,6 +2051,8 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
-     if (!EvdevBitIsSet(pEvdev->bitmask, EV_REL))
-         goto out;
- 
-+    EvdevForceWheel(pInfo);
-+
-     num_axes = EvdevCountBits(pEvdev->rel_bitmask, NLONGS(REL_MAX));
-     if (num_axes < 1)
-         goto out;
-@@ -2583,6 +2588,19 @@ EvdevGrabDevice(InputInfoPtr pInfo, int grab, int ungrab)
- }
- 
- /**
-+ * Some devices require REL_WHEEL and REL_HWHEEL axes to emulate wheel
-+ * activities.
-+ */
-+static void
-+EvdevForceWheel(InputInfoPtr pInfo)
-+{
-+    EvdevPtr pEvdev = pInfo->private;
-+
-+    EvdevSetBit(pEvdev->rel_bitmask, REL_WHEEL);
-+    EvdevSetBit(pEvdev->rel_bitmask, REL_HWHEEL);
-+}
-+
-+/**
-  * Some devices only have other axes (e.g. wheels), but we
-  * still need x/y for these. The server relies on devices having
-  * x/y as axes 0/1 and core/XI 1.x clients expect it too (#44655)
-diff --git a/src/evdev.h b/src/evdev.h
---- a/src/evdev.h
-+++ b/src/evdev.h
-@@ -314,6 +314,10 @@ void EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int num_v, int first_v,
- 				   int v[MAX_VALUATORS]);
- unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code);
- 
-+/* Event processing functions */
-+void EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo,
-+				     struct input_event *ev);
-+
- /* Middle Button emulation */
- int  EvdevMBEmuTimer(InputInfoPtr);
- BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL);
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch
deleted file mode 100644
index 9a4c9a408c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch
+++ /dev/null
@@ -1,537 +0,0 @@
-From: Chung-yih Wang <cywang@chromium.org>
-Date: Thu, 15 Nov 2012 16:17:12 +0800
-Subject: [PATCH] x11-drivers/xf86-input-evdev: Add SYN_DROPPED handling
-
-If an evdev client cannot consume evdev events in its queue fast enough, the
-evdev kernel driver will enqueue a SYN_DROPPED event and clear the queue
-once the client's queue is full. The result is that the X driver will be out
-of sync with respect to the kernel driver state. The patch tries to handle the
-SYN_DROPPED event by retrieving the kernel driver's state. Retrieving this
-state is inherently non-atomic, since it requires a sequence of ioctls. We use
-a simple before and after time stamping approach to deal with the race
-condition between partially syncing state and any potentially stale events that
-arrive during synchronization.
----
- src/evdev.c |  371 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- src/evdev.h |   17 +++
- 2 files changed, 381 insertions(+), 7 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -127,11 +127,27 @@ static void EvdevSetCalibration(InputInfoPtr pInfo, int num_calibration, int cal
- static int EvdevOpenDevice(InputInfoPtr pInfo);
- static void EvdevCloseDevice(InputInfoPtr pInfo);
- 
-+static int EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type,
-+                            uint16_t code, int32_t value);
- static void EvdevInitAxesLabels(EvdevPtr pEvdev, int mode, int natoms, Atom *atoms);
- static void EvdevInitButtonLabels(EvdevPtr pEvdev, int natoms, Atom *atoms);
- static void EvdevInitProperty(DeviceIntPtr dev);
- static int EvdevSetProperty(DeviceIntPtr dev, Atom atom,
-                             XIPropertyValuePtr val, BOOL checkonly);
-+static void EvdevSyncState(InputInfoPtr pInfo);
-+static void EvdevGetKernelTime(struct timeval *current_time,
-+                               BOOL use_monotonic);
-+static int EvdevKeyStateSync(InputInfoPtr pInfo);
-+static int EvdevAbsAxesSync(InputInfoPtr pInfo);
-+static int EvdevAbsMtSlotSync(InputInfoPtr pInfo);
-+static int EvdevInjectAbsMtAxisChangeEvent(InputInfoPtr pInfo, int slot_index,
-+                                           uint16_t code, int32_t value);
-+static int EvdevCheckAbsMtAxesChange(InputInfoPtr pInfo, MTSlotInfoPtr slots,
-+                                     int *count_after_synreport);
-+static int EvdevGetAllSlotVals(InputInfoPtr pInfo, MTSlotInfoPtr slots);
-+static int EvdevAbsMtStateSync(InputInfoPtr pInfo, int *count_after_synreport);
-+static int EvdevAbsStateSync(InputInfoPtr pInfo, int *count_after_synreport);
-+
- static Atom prop_product_id;
- static Atom prop_invert;
- static Atom prop_calibration;
-@@ -205,6 +221,11 @@ static inline void EvdevSetBit(unsigned long *array, int bit)
-     array[bit / LONG_BITS] |= (1LL << (bit % LONG_BITS));
- }
- 
-+static inline void EvdevClearBit(unsigned long *array, int bit)
-+{
-+    array[bit / LONG_BITS] &= ~(1LL << (bit % LONG_BITS));
-+}
-+
- static int
- EvdevGetMajorMinor(InputInfoPtr pInfo)
- {
-@@ -660,6 +681,11 @@ EvdevProcessButtonEvent(InputInfoPtr pInfo, struct input_event *ev)
-     /* Get the signed value, earlier kernels had this as unsigned */
-     value = ev->value;
- 
-+    if (ev->value)
-+        EvdevSetBit(pEvdev->key_state_bitmask, ev->code);
-+    else
-+        EvdevClearBit(pEvdev->key_state_bitmask, ev->code);
-+
-     /* Handle drag lock */
-     if (EvdevDragLockFilterEvent(pInfo, button, value))
-         return;
-@@ -787,6 +813,7 @@ EvdevProcessTouchEvent(InputInfoPtr pInfo, struct input_event *ev)
-         if (pEvdev->slot_state == SLOTSTATE_EMPTY)
-             pEvdev->slot_state = SLOTSTATE_UPDATE;
-         if (ev->code == ABS_MT_TRACKING_ID) {
-+            pEvdev->cached_tid[slot_index] = ev->value;
-             if (ev->value >= 0) {
-                 pEvdev->slot_state = SLOTSTATE_OPEN;
- 
-@@ -1000,7 +1027,7 @@ static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v,
-  * Take the synchronization input event and process it accordingly; the motion
-  * notify events are sent first, then any button/key press/release events.
-  */
--static void
-+static BOOL
- EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev)
- {
-     int i;
-@@ -1008,6 +1035,11 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev)
-     int v[MAX_VALUATORS] = {};
-     EvdevPtr pEvdev = pInfo->private;
- 
-+    if (ev->code == SYN_DROPPED) {
-+        xf86IDrvMsg(pInfo, X_INFO, "+++ SYN_DROPPED +++\n");
-+        return TRUE;
-+    }
-+
-     EvdevProcessProximityState(pInfo);
- 
-     EvdevProcessValuators(pInfo);
-@@ -1035,16 +1067,20 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev)
-     pEvdev->abs_queued = 0;
-     pEvdev->rel_queued = 0;
-     pEvdev->prox_queued = 0;
--
-+    return FALSE;
- }
- 
- /**
-  * Process the events from the device; nothing is actually posted to the server
-- * until an EV_SYN event is received.
-+ * until an EV_SYN event is received. As the SYN_DROPPED event indicates that the
-+ * state of evdev driver will be out of sync with the event queue, additional
-+ * handling is required for processing the SYN_DROPPED event. The function returns
-+ * TRUE if a SYN_DROPPED event is received, FALSE otherwise.
-  */
--static void
-+static BOOL
- EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev)
- {
-+    BOOL syn_dropped = FALSE;
-     switch (ev->type) {
-         case EV_REL:
-             EvdevProcessRelativeMotionEvent(pInfo, ev);
-@@ -1056,9 +1092,10 @@ EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev)
-             EvdevProcessKeyEvent(pInfo, ev);
-             break;
-         case EV_SYN:
--            EvdevProcessSyncEvent(pInfo, ev);
-+            syn_dropped = EvdevProcessSyncEvent(pInfo, ev);
-             break;
-     }
-+    return syn_dropped;
- }
- 
- #undef ABS_X_VALUE
-@@ -1089,6 +1126,308 @@ EvdevFreeMasks(EvdevPtr pEvdev)
- #endif
- }
- 
-+static void
-+EvdevGetKernelTime(struct timeval *current_time, BOOL use_monotonic) {
-+    struct timespec now;
-+    clockid_t clockid = (use_monotonic) ? CLOCK_MONOTONIC : CLOCK_REALTIME;
-+
-+    clock_gettime(clockid, &now);
-+    current_time->tv_sec = now.tv_sec;
-+    current_time->tv_usec = now.tv_nsec / 1000;
-+}
-+
-+static int
-+EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type, uint16_t code,
-+                 int32_t value) {
-+    EvdevPtr pEvdev = pInfo->private;
-+    struct input_event ev;
-+
-+    ev.type = type;
-+    ev.code = code;
-+    ev.value = value;
-+    EvdevGetKernelTime(&ev.time, pEvdev->is_monotonic);
-+    /* Inject the event by processing it */
-+    EvdevProcessEvent(pInfo, &ev);
-+    return 1;
-+}
-+
-+static int
-+EvdevKeyStateSync(InputInfoPtr pInfo) {
-+    EvdevPtr pEvdev = pInfo->private;
-+    unsigned long key_state_bitmask[NLONGS(KEY_CNT)];
-+    int i, ev_count = 0;
-+    int len = sizeof(key_state_bitmask);
-+
-+    if (ioctl(pInfo->fd, EVIOCGKEY(len), key_state_bitmask) < 0) {
-+        xf86IDrvMsg(pInfo, X_ERROR,
-+                    "ioctl EVIOCGKEY failed: %s\n", strerror(errno));
-+        return !Success;
-+    }
-+    for (i = 0; i < KEY_CNT; i++) {
-+        int orig_value, current_value;
-+        if (!EvdevBitIsSet(pEvdev->key_bitmask, i))
-+            continue;
-+        orig_value = EvdevBitIsSet(pEvdev->key_state_bitmask, i);
-+        current_value = EvdevBitIsSet(key_state_bitmask, i);
-+        if (current_value == orig_value)
-+            continue;
-+        ev_count += EvdevInjectEvent(pInfo, EV_KEY, i, current_value);
-+    }
-+    return ev_count;
-+}
-+
-+static int
-+EvdevAbsAxesSync(InputInfoPtr pInfo) {
-+    EvdevPtr device = pInfo->private;
-+    struct input_absinfo absinfo;
-+    int i, ev_count = 0;
-+
-+    /* Sync all ABS_ axes excluding ABS_MT_ axes */
-+    for (i = ABS_X; i < ABS_MAX; i++) {
-+        if (i >= ABS_MT_SLOT && i <= _ABS_MT_LAST)
-+            continue;
-+        if (!EvdevBitIsSet(device->abs_bitmask, i))
-+            continue;
-+        if (ioctl(pInfo->fd, EVIOCGABS(i), &absinfo) < 0) {
-+            xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGABS(%zu) failed: %s\n",
-+                        i, strerror(errno));
-+        } else if (absinfo.value != device->absinfo[i].value) {
-+            ev_count += EvdevInjectEvent(pInfo, EV_ABS, i, absinfo.value);
-+        }
-+    }
-+    return ev_count;
-+}
-+
-+static int
-+EvdevAbsMtSlotSync(InputInfoPtr pInfo) {
-+    EvdevPtr device = pInfo->private;
-+    struct input_absinfo absinfo;
-+    int ev_count = 0;
-+
-+    if (ioctl(pInfo->fd, EVIOCGABS(ABS_MT_SLOT), &absinfo) < 0) {
-+        xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGABS(ABS_MT_SLOT) failed: %s\n",
-+                    strerror(errno));
-+        return 0;
-+    }
-+    if (device->cur_slot != absinfo.value)
-+        ev_count = EvdevInjectEvent(pInfo, EV_ABS, ABS_MT_SLOT, absinfo.value);
-+    return ev_count;
-+}
-+
-+static int
-+EvdevInjectAbsMtAxisChangeEvent(InputInfoPtr pInfo, int slot_index,
-+                                uint16_t code, int32_t value) {
-+    EvdevPtr device = pInfo->private;
-+    int ev_count = 0;
-+
-+    if (device->cur_slot != slot_index)
-+        ev_count += EvdevInjectEvent(pInfo, EV_ABS, ABS_MT_SLOT, slot_index);
-+    ev_count += EvdevInjectEvent(pInfo, EV_ABS, code, value);
-+    return ev_count;
-+}
-+
-+static int
-+EvdevCheckAbsMtAxesChange(InputInfoPtr pInfo, MTSlotInfoPtr slots,
-+                          int *count_after_synreport)
-+{
-+    EvdevPtr device = pInfo->private;
-+    int i, j, ev_count = 0;
-+    int total_ev_count = 0;
-+
-+    /*
-+     * There will be five conditions of a slot change after SYN_DROPPED:
-+     * a. Finger leaving, i.e., tracking id changes from a non-negative
-+     *    number to -1.
-+     * b. Finger arriving, i.e., tracking id changes from -1 to a
-+     *    non-negative number.
-+     * c. Finger changing, i.e., original finger leaving and new finger
-+     *    arriving, tracking id changes from a non-negative number to
-+     *    another one.
-+     * d. Same finger, but axes change, i.e., no tracking id changes, but some
-+     *    axes values have changed.
-+     * e. Fingers arrive and leave: tracking ID was -1, and is still -1, but
-+     *    some axes values have changed.
-+     * f. nothing changed
-+     *
-+     * To have X server seamless of SYN_DROPPED event, additional event
-+     * injections will be required except for conditions e and f:
-+     *
-+     * Finger leaving (a): all axes of the slot should be updated first, then
-+     * followed with tracking id change (-1).
-+     *
-+     * Finger arriving (b): new tracking id should be injected first, followed
-+     * with all axes updates.
-+     *
-+     * Finger changing (c): first, inject finger leaving with tracking id -1,
-+     * followed with new tracking id event, then update all axes data.
-+     *
-+     * Same finger, but axes change (d): all axes updates should be injected
-+     *
-+     */
-+
-+    for (i = 0; i < num_slots(device); i++) {
-+        int curr_tid = slots[ABS_MT_TRACKING_ID - _ABS_MT_FIRST].values[i];
-+        int orig_tid = device->cached_tid[i];
-+
-+        /* For conditions b and c, inject the tracking id change events first */
-+        if (orig_tid != curr_tid && curr_tid != -1) {
-+            /* For (c), inject the leaving event for original finger */
-+            if (orig_tid != -1) {
-+                ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo,
-+                                                            i,
-+                                                            ABS_MT_TRACKING_ID,
-+                                                            -1);
-+                ev_count += EvdevInjectEvent(pInfo, EV_SYN, SYN_REPORT, 0);
-+                /* Reset the count_after_synreport after SYN_REPORT event */
-+                total_ev_count += ev_count;
-+                *count_after_synreport = ev_count = 0;
-+            }
-+            /* For (b) and (c), set the new tid before updating axes */
-+            ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo,
-+                                                        i,
-+                                                        ABS_MT_TRACKING_ID,
-+                                                        curr_tid);
-+        }
-+
-+
-+        for (j = _ABS_MT_FIRST; j <= _ABS_MT_LAST; j++) {
-+            int axis = j - _ABS_MT_FIRST;
-+            int map, orig_value, curr_value;
-+            if ((j == ABS_MT_TRACKING_ID) ||
-+                ((map = device->axis_map[j]) == -1))
-+                continue;
-+            if (!EvdevBitIsSet(device->abs_bitmask, j))
-+                continue;
-+
-+            orig_value = valuator_mask_get(device->last_mt_vals[i], map);
-+            curr_value = slots[axis].values[i];
-+
-+            if (orig_value == curr_value)
-+                continue;
-+
-+            /* For condition e, internal axes values should be updated */
-+            if (orig_tid == -1 && curr_tid == -1) {
-+                valuator_mask_set(device->last_mt_vals[i], map, curr_value);
-+                continue;
-+            }
-+
-+            /* In addition to condition d, all axes updates will be injected */
-+            ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo,
-+                                                        i,
-+                                                        j,
-+                                                        curr_value);
-+        }
-+
-+        /* For condition a, inject finger leaving event */
-+        if (orig_tid != -1 && curr_tid == -1) {
-+            ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo,
-+                                                        i,
-+                                                        ABS_MT_TRACKING_ID,
-+                                                        -1);
-+        }
-+    }
-+    /* Update current slot index if it is different from cur_slot value */
-+    ev_count += EvdevAbsMtSlotSync(pInfo);
-+    *count_after_synreport += ev_count;
-+
-+    return total_ev_count + ev_count;
-+}
-+
-+static int
-+EvdevGetAllSlotVals(InputInfoPtr pInfo, MTSlotInfoPtr slots)
-+{
-+    EvdevPtr device = pInfo->private;
-+    int i;
-+
-+    /* Retrieve current ABS_MT_ axes for all slots */
-+    for (i = _ABS_MT_FIRST; i <= _ABS_MT_LAST; i++) {
-+        MTSlotInfoPtr req = &slots[i - _ABS_MT_FIRST];
-+        if (!EvdevBitIsSet(device->abs_bitmask, i))
-+            continue;
-+        req->code = i;
-+        if (ioctl(pInfo->fd, EVIOCGMTSLOTS((sizeof(*req))), req) < 0) {
-+            xf86IDrvMsg(pInfo, X_ERROR,
-+                        "ioctl EVIOCGMTSLOTS(req.code=%d) failed: %s\n",
-+                        req->code, strerror(errno));
-+            return !Success;
-+        }
-+    }
-+
-+    return Success;
-+}
-+
-+static int
-+EvdevAbsMtStateSync(InputInfoPtr pInfo, int *count_after_synreport) {
-+    MTSlotInfo slots[_ABS_MT_CNT];
-+    int ev_count = 0;
-+
-+    /* Get all current slots axes, then check if there is any update required */
-+    if (EvdevGetAllSlotVals(pInfo, slots) == Success) {
-+        ev_count = EvdevCheckAbsMtAxesChange(pInfo, slots,
-+                                             count_after_synreport);
-+    }
-+
-+    return ev_count;
-+}
-+
-+static int
-+EvdevAbsStateSync(InputInfoPtr pInfo, int *count_after_synreport) {
-+    EvdevPtr device = pInfo->private;
-+    int ev_count;
-+
-+    /* Sync all ABS_ axes */
-+    ev_count = EvdevAbsAxesSync(pInfo);
-+    *count_after_synreport += ev_count;
-+
-+    /* Sync ABS_MT_ axes for all slots if exists */
-+    if (device->num_mt_vals)
-+        ev_count += EvdevAbsMtStateSync(pInfo, count_after_synreport);
-+
-+    return ev_count;
-+}
-+
-+/**
-+ * Synchronize the current state with kernel evdev driver.
-+ */
-+static void
-+EvdevSyncState(InputInfoPtr pInfo)
-+{
-+    int ev_count = 0;
-+    int ev_count_after_synreport = 0;
-+    EvdevPtr device = pInfo->private;
-+
-+    EvdevGetKernelTime(&device->before_sync_time, device->is_monotonic);
-+
-+    ev_count = EvdevKeyStateSync(pInfo);
-+    ev_count_after_synreport += ev_count;
-+
-+    /*
-+     * TODO: sync all led, switch and sound states as well. We probably need
-+     * to post events out actively if the new states are different from the
-+     * cached ones.
-+     */
-+
-+    /* sync abs and abs_mt value/limits */
-+    ev_count += EvdevAbsStateSync(pInfo, &ev_count_after_synreport);
-+
-+    /*
-+     * Push SYN_REPORT event out if there is any event injected
-+     * during the state synchronization.
-+     */
-+    if (ev_count_after_synreport)
-+        ev_count += EvdevInjectEvent(pInfo, EV_SYN, SYN_REPORT, 0);
-+
-+    EvdevGetKernelTime(&device->after_sync_time, device->is_monotonic);
-+
-+    xf86IDrvMsg(pInfo, X_INFO,
-+                "Sync_State: before %ld.%ld after %ld.%ld injected events=%d\n",
-+                device->before_sync_time.tv_sec,
-+                device->before_sync_time.tv_usec,
-+                device->after_sync_time.tv_sec,
-+                device->after_sync_time.tv_usec,
-+                ev_count);
-+}
-+
- /* just a magic number to reduce the number of reads */
- #define NUM_EVENTS 16
- 
-@@ -1097,6 +1436,7 @@ EvdevReadInput(InputInfoPtr pInfo)
- {
-     struct input_event ev[NUM_EVENTS];
-     int i, len = sizeof(ev);
-+    BOOL sync_evdev_state = FALSE;
- 
-     while (len == sizeof(ev))
-     {
-@@ -1131,9 +1471,23 @@ EvdevReadInput(InputInfoPtr pInfo)
-             break;
-         }
- 
--        for (i = 0; i < len/sizeof(ev[0]); i++)
--            EvdevProcessEvent(pInfo, &ev[i]);
-+        for (i = 0; i < len/sizeof(ev[0]); i++) {
-+            if (sync_evdev_state)
-+                break;
-+            if (timercmp(&ev[i].time, &pEvdev->before_sync_time, <)) {
-+              /* Ignore events before last sync time */
-+              continue;
-+            } else if (timercmp(&ev[i].time, &pEvdev->after_sync_time, >)) {
-+              /* Event_Process returns TRUE if SYN_DROPPED detected */
-+              sync_evdev_state = EvdevProcessEvent(pInfo, &ev[i]);
-+            } else {
-+              /* If the event occurred during sync, then sync again */
-+              sync_evdev_state = TRUE;
-+            }
-+        }
-     }
-+    if (sync_evdev_state)
-+        EvdevSyncState(pInfo);
- }
- 
- static void
-@@ -1325,6 +1679,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
-         }
- 
-         for (i = 0; i < num_slots(pEvdev); i++) {
-+            pEvdev->cached_tid[i] = -1;
-             pEvdev->last_mt_vals[i] = valuator_mask_new(num_mt_axes_total);
-             if (!pEvdev->last_mt_vals[i]) {
-                 xf86IDrvMsg(pInfo, X_ERROR,
-@@ -1850,6 +2205,8 @@ EvdevOn(DeviceIntPtr device)
-     Evdev3BEmuOn(pInfo);
-     pEvdev->flags |= EVDEV_INITIALIZED;
-     device->public.on = TRUE;
-+    pEvdev->slot_state = SLOTSTATE_EMPTY;
-+    EvdevSyncState(pInfo);
- 
-     return Success;
- }
-diff --git a/src/evdev.h b/src/evdev.h
---- a/src/evdev.h
-+++ b/src/evdev.h
-@@ -97,6 +97,12 @@
- /* Number of longs needed to hold the given number of bits */
- #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
- 
-+#define _ABS_MT_FIRST       ABS_MT_TOUCH_MAJOR
-+#define _ABS_MT_LAST        ABS_MT_DISTANCE
-+#define _ABS_MT_CNT         (_ABS_MT_LAST - _ABS_MT_FIRST + 1)
-+
-+#define MAX_SLOT_COUNT  64
-+
- /* Function key mode */
- enum fkeymode {
-     FKEYMODE_UNKNOWN = 0,
-@@ -250,8 +256,19 @@ typedef struct {
-     EventQueueRec           queue[EVDEV_MAXQUEUE];
- 
-     enum fkeymode           fkeymode;
-+
-+    /* Sync timestamps */
-+    unsigned long key_state_bitmask[NLONGS(KEY_CNT)];
-+    struct timeval before_sync_time;
-+    struct timeval after_sync_time;
-+    int32_t cached_tid[MAX_SLOT_COUNT];
- } EvdevRec, *EvdevPtr;
- 
-+typedef struct {
-+    uint32_t code;
-+    int32_t values[MAX_SLOT_COUNT];
-+} MTSlotInfo, *MTSlotInfoPtr;
-+
- /* Event posting functions */
- void EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value);
- void EvdevQueueButtonEvent(InputInfoPtr pInfo, int button, int value);
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch
deleted file mode 100644
index e3bd81f601..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Daniel Erat <derat@chromium.org>
-Date: Wed, 21 Mar 2012 10:44:51 -0700
-Subject: [PATCH] Disable smooth scrolling in xf86-input-evdev.
-
-This caused additional valuator-containing motion events to
-be sent on behalf of the scrollwheel, which Chrome treated
-identically to touchpad scroll events, resulting in the
-scrollwheel being unusable.
-
-BUG=chromium:118608
-TEST=manual: we scroll 106 pixels for each scrollwheel click on stumpy
----
- src/evdev.h |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/evdev.h b/src/evdev.h
---- a/src/evdev.h
-+++ b/src/evdev.h
-@@ -67,6 +67,10 @@
- #define HAVE_SMOOTH_SCROLLING 1
- #endif
- 
-+/* Smooth scrolling results in the mousewheel generating motion events with
-+ * valuators that confuse Chrome: http://crosbug.com/118608 */
-+#undef HAVE_SMOOTH_SCROLLING
-+
- #define EVDEV_MAXBUTTONS 32
- #define EVDEV_MAXQUEUE 32
- 
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild
deleted file mode 120000
index cfca3b06c2..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-xf86-input-evdev-2.7.3.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild
deleted file mode 100644
index 6a67e767e0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild,v 1.1 2012/08/14 01:24:15 chithanh Exp $
-
-EAPI=4
-XORG_EAUTORECONF=yes
-
-inherit xorg-2
-
-DESCRIPTION="Generic Linux input driver"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
-IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.10[udev]
-	sys-libs/mtdev"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.1.99.3
-	>=sys-kernel/linux-headers-2.6"
-
-PATCHES=(
-	"${FILESDIR}"/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch
-        # crosbug.com/35291
-	"${FILESDIR}"/evdev-2.7.3-Add-SYN_DROPPED-handling.patch
-	"${FILESDIR}/evdev-disable-smooth-scrolling.patch"
-	"${FILESDIR}/evdev-2.6.99-wheel-accel.patch"
-	"${FILESDIR}"/evdev-2.7.0-feedback-log.patch
-	"${FILESDIR}"/evdev-2.7.0-add-touch-event-timestamp.patch
-	# crosbug.com/p/13787
-	"${FILESDIR}"/evdev-2.7.0-fix-emulated-wheel.patch
-	"${FILESDIR}"/evdev-2.7.0-add-block-reading-support.patch
-)
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/Manifest
deleted file mode 100644
index 405cf002af..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xf86-video-armsoc-0.0.1.tar.bz2 194556 SHA256 51dd0b7dae6a216cb3b197436e4c1d0c7dcf15049e947543d45942fbd000b314 SHA512 cf6ca259059f9f1364ce936de4ee21ecbcb3b0a839622f83a6e62abadc1176be9d0dad83c86fe3aa25ad3c2297f0e6f55d4f33f10f91eaff7897a2cfe43bb39e WHIRLPOOL 4f77e7f2c0f89f09853e5d25e376494c813a7ee4a50b5cdefc20df1c5f5b99d2202c7580fa4dd9f221a152321d7656986729aa8383390cc1354d5abd8eb6eda1
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild
deleted file mode 100644
index 1fab3d2371..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU Public License v2
-
-EAPI="4"
-CROS_WORKON_COMMIT="9eb527e3cf926175eda9063fa0ef65504c816364"
-CROS_WORKON_TREE="0d2d6cd5e23e84585ebe72df251360086c8408bf"
-CROS_WORKON_PROJECT="chromiumos/third_party/xf86-video-armsoc"
-CROS_WORKON_LOCALNAME="xf86-video-armsoc"
-
-XORG_DRI="always"
-XORG_EAUTORECONF="yes"
-
-inherit xorg-2 cros-workon
-
-DESCRIPTION="X.Org driver for ARM devices"
-
-KEYWORDS="-* arm"
-
-RDEPEND=">=x11-base/xorg-server-1.9"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	cros-workon_src_unpack
-	mkdir -p "${S}"/m4
-}
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
deleted file mode 100644
index 894d9824f7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU Public License v2
-
-EAPI="4"
-CROS_WORKON_PROJECT="chromiumos/third_party/xf86-video-armsoc"
-CROS_WORKON_LOCALNAME="xf86-video-armsoc"
-
-XORG_DRI="always"
-XORG_EAUTORECONF="yes"
-
-inherit xorg-2 cros-workon
-
-DESCRIPTION="X.Org driver for ARM devices"
-
-KEYWORDS="-* ~arm"
-
-RDEPEND=">=x11-base/xorg-server-1.9"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	cros-workon_src_unpack
-	mkdir -p "${S}"/m4
-}
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest
deleted file mode 100644
index 0d8026d6c1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xf86-video-intel-2.16.0.tar.bz2 1249069 RMD160 9eb9aeabecfbe9f6dde6c81a59c07d9d90f2dc69 SHA1 53441ea4d4335b501d32809b6b92593cbb1f79cf SHA256 77482bcd1e30a57b68ba0d6a1862b4ff3c55fa23bf0109ec2af318a3e066ebfe
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch
deleted file mode 100644
index 60e474aacd..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Disable gamma setting. We set this early at boot and we don't want X to mess with our settings.
-diff -paur xf86-video-intel-2.14.0.orig/src/intel_display.c xf86-video-intel-2.14.0.work/src/intel_display.c
---- xf86-video-intel-2.14.0.orig/src/intel_display.c	2011-01-10 15:02:16.534513000 -0800
-+++ xf86-video-intel-2.14.0.work/src/intel_display.c	2011-04-18 13:40:46.586165000 -0700
-@@ -617,6 +617,7 @@ static void
- intel_crtc_gamma_set(xf86CrtcPtr crtc,
- 		       CARD16 *red, CARD16 *green, CARD16 *blue, int size)
- {
-+	return;
- 	struct intel_crtc *intel_crtc = crtc->driver_private;
- 	struct intel_mode *mode = intel_crtc->mode;
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch
deleted file mode 100644
index 3a703258f3..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -paur xf86-video-intel-2.14.0.orig/src/intel_display.c xf86-video-intel-2.14.0.work/src/intel_display.c
---- xf86-video-intel-2.14.0.orig/src/intel_display.c	2011-01-10 15:02:16.534513000 -0800
-+++ xf86-video-intel-2.14.0.work/src/intel_display.c	2011-05-19 15:06:39.732535000 -0700
-@@ -57,6 +57,8 @@ struct intel_mode {
- 	unsigned int fe_tv_sec;
- 	unsigned int fe_tv_usec;
- 
-+	unsigned int last_queued_frame;
-+
- 	struct list outputs;
- 	struct list crtcs;
- };
-@@ -1435,6 +1437,12 @@ intel_do_pageflip(intel_screen_private *
- 	int i, old_fb_id;
- 
- 	/*
-+	 * Discard this flip since we already have one pending for this frame.
-+	 */
-+	if (  flip_info->frame <= mode->last_queued_frame )
-+		return FALSE;
-+
-+	/*
- 	 * Create a new handle for the back buffer
- 	 */
- 	old_fb_id = mode->fb_id;
-@@ -1490,11 +1498,15 @@ intel_do_pageflip(intel_screen_private *
- 	}
- 
- 	mode->old_fb_id = old_fb_id;
-+	mode->last_queued_frame = flip_info->frame;
- 	return TRUE;
- 
- error_undo:
- 	drmModeRmFB(mode->fd, mode->fb_id);
- 	mode->fb_id = old_fb_id;
-+	for (i = 0; i < config->num_crtc; i++)
-+		if (config->crtc[i]->enabled)
-+			mode->flip_count--;
- 
- error_out:
- 	xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n",
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch
deleted file mode 100644
index 99c9cb9b5e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-commit 46f97127c22ea42bc8fdae59d2a133e4b8b6c997
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Sun Oct 16 21:40:15 2011 +0100
-
-    snb,ivb: Workaround unknown blitter death
-    
-    The first workaround was a performance killing MI_FLUSH_DW after every
-    op. This workaround appears to be a stable compromise instead, only
-    requiring a redundant command after every BLT command with little
-    impact on throughput.
-    
-    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=27892
-    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39524
-    Tested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
-diff --git a/src/intel_uxa.c b/src/intel_uxa.c
-index 30717d0..9e58c69 100644
---- a/src/intel_uxa.c
-+++ b/src/intel_uxa.c
-@@ -340,13 +340,6 @@ static void intel_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2)
- 	}
- }
- 
--static void intel_uxa_done_solid(PixmapPtr pixmap)
--{
--	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
--
--	intel_debug_flush(scrn);
--}
--
- /**
-  * TODO:
-  *   - support planemask using FULL_BLT_CMD?
-@@ -501,9 +494,19 @@ intel_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1,
- 	}
- }
- 
--static void intel_uxa_done_copy(PixmapPtr dest)
-+static void intel_uxa_done(PixmapPtr pixmap)
- {
--	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
-+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
-+	intel_screen_private *intel = intel_get_screen_private(scrn);
-+
-+	if (IS_GEN6(intel) || IS_GEN7(intel)) {
-+		/* workaround a random BLT hang */
-+		BEGIN_BATCH_BLT(3);
-+		OUT_BATCH(XY_SETUP_CLIP_BLT_CMD);
-+		OUT_BATCH(0);
-+		OUT_BATCH(0);
-+		ADVANCE_BATCH();
-+	}
- 
- 	intel_debug_flush(scrn);
- }
-@@ -1225,13 +1228,13 @@ Bool intel_uxa_init(ScreenPtr screen)
- 	intel->uxa_driver->check_solid = intel_uxa_check_solid;
- 	intel->uxa_driver->prepare_solid = intel_uxa_prepare_solid;
- 	intel->uxa_driver->solid = intel_uxa_solid;
--	intel->uxa_driver->done_solid = intel_uxa_done_solid;
-+	intel->uxa_driver->done_solid = intel_uxa_done;
- 
- 	/* Copy */
- 	intel->uxa_driver->check_copy = intel_uxa_check_copy;
- 	intel->uxa_driver->prepare_copy = intel_uxa_prepare_copy;
- 	intel->uxa_driver->copy = intel_uxa_copy;
--	intel->uxa_driver->done_copy = intel_uxa_done_copy;
-+	intel->uxa_driver->done_copy = intel_uxa_done;
- 
- 	/* Composite */
- 	if (IS_GEN2(intel)) {
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch
deleted file mode 100644
index 4bebd60ab5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff --git a/src/intel.h b/src/intel.h
-index 42afaf4..22527df 100644
---- a/src/intel.h
-+++ b/src/intel.h
-@@ -465,6 +465,7 @@ extern void intel_mode_fini(intel_screen_private *intel);
- extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
- extern int intel_crtc_id(xf86CrtcPtr crtc);
- extern int intel_output_dpms_status(xf86OutputPtr output);
-+extern void intel_copy_fb(ScrnInfoPtr pScrn);
- 
- enum DRI2FrameEventType {
- 	DRI2_SWAP,
-diff --git a/src/intel_display.c b/src/intel_display.c
-index 84c7c08..e52ca67 100644
---- a/src/intel_display.c
-+++ b/src/intel_display.c
-@@ -30,6 +30,7 @@
- #endif
- 
- #include <sys/types.h>
-+#include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-@@ -1435,6 +1436,109 @@ fail:
- 	return FALSE;
- }
- 
-+static PixmapPtr
-+intel_create_pixmap_for_fbcon(ScrnInfoPtr pScrn)
-+{
-+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-+	ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-+	drmModeFBPtr fbcon = NULL;
-+	PixmapPtr pixmap = NULL;
-+	struct drm_gem_flink flink;
-+	drm_intel_bo *bo;
-+
-+	struct intel_crtc *intel_crtc = xf86_config->crtc[0]->driver_private;
-+	struct intel_mode *intel_mode = intel_crtc->mode;
-+	intel_screen_private *intel = intel_get_screen_private(pScrn);
-+	int i;
-+
-+	for (i = 0; i < intel_mode->mode_res->count_crtcs; i++) {
-+		intel_crtc = xf86_config->crtc[i]->driver_private;
-+
-+		fbcon = drmModeGetFB(intel_mode->fd, intel_crtc->mode_crtc->buffer_id);
-+		if (fbcon != NULL) break;
-+	}
-+	if (fbcon == NULL) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+				"Couldn't find an fbcon\n.");
-+		return NULL;
-+	}
-+	flink.handle = fbcon->handle;
-+	if (ioctl(intel_mode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+				"Couldn't flink fbcon handle\n");
-+		return NULL;
-+	}
-+	bo = drm_intel_bo_gem_create_from_name(intel->bufmgr,
-+			"fbcon", flink.name);
-+
-+	if (bo == NULL) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+				"Couldn't allocate bo for fbcon handle\n");
-+		return NULL;
-+	}
-+
-+	pixmap = GetScratchPixmapHeader(pScreen,
-+			fbcon->width, fbcon->height,
-+			fbcon->depth, fbcon->bpp,
-+			fbcon->pitch, NULL);
-+	if (pixmap == NULL) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+				"Couldn't allocate pixmap fbcon contents\n");
-+		return NULL;
-+	}
-+
-+	intel_set_pixmap_bo(pixmap, bo);
-+	drm_intel_bo_unreference(bo);
-+	drmModeFreeFB(fbcon);
-+
-+	return pixmap;
-+}
-+
-+void intel_copy_fb(ScrnInfoPtr pScrn)
-+{
-+	ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-+	intel_screen_private *intel = intel_get_screen_private(pScrn);
-+	PixmapPtr src, dst;
-+	unsigned int pitch = pScrn->displayWidth * intel->cpp;
-+	int savePMSize;
-+	int pixmap_size;
-+
-+	/* Ugly: this runs before CreateScratchPixmap() which normally calculates
-+	   this number :(
-+	 */
-+	pixmap_size = sizeof(PixmapRec) + dixPrivatesSize(PRIVATE_PIXMAP);
-+	savePMSize = pScreen->totalPixmapSize;
-+	pScreen->totalPixmapSize = BitmapBytePad(pixmap_size * 8);
-+
-+	src = intel_create_pixmap_for_fbcon(pScrn);
-+	if (src == NULL) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+				"Couldn't create pixmap for fbcon\n");
-+		pScreen->totalPixmapSize = savePMSize;
-+		return;
-+	}
-+
-+	/* We dont have a screen Pixmap yet */
-+	dst = GetScratchPixmapHeader(pScreen,
-+			pScrn->virtualX, pScrn->virtualY,
-+			pScrn->depth, pScrn->bitsPerPixel,
-+			pitch,
-+			NULL);
-+	pScreen->totalPixmapSize = savePMSize;
-+	intel_set_pixmap_bo(dst,intel->front_buffer);
-+	intel->uxa_driver->prepare_copy(src, dst, -1, -1, GXcopy, FB_ALLONES);
-+
-+	intel->uxa_driver->copy(dst, 0, 0, 0, 0,
-+			pScrn->virtualX, pScrn->virtualY);
-+	intel->uxa_driver->done_copy(dst);
-+
-+	intel_batch_submit(pScrn);
-+
-+	(*pScreen->DestroyPixmap)(src);
-+	(*pScreen->DestroyPixmap)(dst);
-+
-+}
-+
- Bool
- intel_do_pageflip(intel_screen_private *intel,
- 		  dri_bo *new_front,
-@@ -1584,6 +1688,8 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp)
- 	unsigned int i;
- 	int has_flipping;
- 
-+	scrn->canDoBGNoneRoot = TRUE;
-+
- 	mode = calloc(1, sizeof *mode);
- 	if (!mode)
- 		return FALSE;
-diff --git a/src/intel_driver.c b/src/intel_driver.c
-index 7fc1c1a..40ff396 100644
---- a/src/intel_driver.c
-+++ b/src/intel_driver.c
-@@ -1154,6 +1154,8 @@ static Bool I830EnterVT(int scrnIndex, int flags)
- 
- 	intel_set_gem_max_sizes(scrn);
- 
-+	intel_copy_fb(scrn);
-+
- 	if (!xf86SetDesiredModes(scrn))
- 		return FALSE;
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch
deleted file mode 100644
index 8f2a407372..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e1f718b600029d43bb2e2e4a6b50e5a990c6d08d Mon Sep 17 00:00:00 2001
-From: Chris Wolfe <cwolfe@chromium.org>
-Date: Mon, 5 Nov 2012 11:10:24 -0500
-Subject: [PATCH] xf86-video-intel: Avoid display corruption when unable to
- flip.
-
-This replaces the previous patch to xorg-server for crosbug/33775.
-That change avoids calling ScheduleSwap when a flip would not be
-classically possible, so interferes with the upcoming per-crtc
-flip feature.
-
-BUG=chromium-os:35796
-TEST=Rapidly minimize/restore/tile window so that the animation spans
-     monitors, observe that none of the preview shadow is left behind.
----
- src/intel_dri.c |   12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/intel_dri.c b/src/intel_dri.c
-index 1227dbb..938a022 100644
---- a/src/intel_dri.c
-+++ b/src/intel_dri.c
-@@ -1151,10 +1151,16 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 
- 	/* Flips need to be submitted one frame before */
- 	if (can_exchange(draw, front, back)) {
--	    swap_type = DRI2_FLIP;
--	    flip = 1;
-+		swap_type = DRI2_FLIP;
-+		flip = 1;
-+	} else {
-+		/* Using the DRI2_SWAP path defers the back-to-front blit until
-+		 * the frame event handler. If another swap comes in before that
-+		 * event executes, our two-frame damage tracking will copy from
-+		 * the unfinished frame and cause corruption. To avoid this
-+		 * problem we force an immediate blit here. */
-+		goto blit_fallback;
- 	}
--
- 	swap_info->type = swap_type;
- 
- 	/* Correct target_msc by 'flip' if swap_type == DRI2_FLIP.
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch
deleted file mode 100644
index 29cb999694..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/intel_display.c b/src/intel_display.c
-index 84c7c08..a9dee28 100644
---- a/src/intel_display.c
-+++ b/src/intel_display.c
-@@ -400,7 +400,6 @@ intel_crtc_apply(xf86CrtcPtr crtc)
- 			continue;
- 
- 		    intel_output = output->driver_private;
--		    intel_output_dpms_backlight(output, intel_output->dpms_mode, DPMSModeOn);
- 		    intel_output->dpms_mode = DPMSModeOn;
- 		}
- 	}
-@@ -950,9 +949,6 @@ intel_output_dpms(xf86OutputPtr output, int dpms)
- 						    intel_output->output_id,
- 						    props->prop_id,
- 						    dpms);
--			intel_output_dpms_backlight(output,
--						      intel_output->dpms_mode,
--						      dpms);
- 			intel_output->dpms_mode = dpms;
- 			drmModeFreeProperty(props);
- 			return;
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch
deleted file mode 100644
index 3dd4a57e0e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/intel_driver.c b/src/intel_driver.c
-index 9d1c4e8..3e4f664 100644
---- a/src/intel_driver.c
-+++ b/src/intel_driver.c
-@@ -677,6 +677,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
- 		xf86ReturnOptValBool(intel->Options,
- 				     OPTION_TRIPLE_BUFFER,
- 				     TRUE);
-+	intel->use_triple_buffer = FALSE;
- 	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Triple buffering? %s\n",
- 		   intel->use_triple_buffer ? "enabled" : "disabled");
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch
deleted file mode 100644
index 5a38919e4e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch
+++ /dev/null
@@ -1,1490 +0,0 @@
-From 715ca0c0ccd94650948efd36a9e7b4592c306906 Mon Sep 17 00:00:00 2001
-From: Chris Wolfe <cwolfe@chromium.org>
-Date: Thu, 20 Dec 2012 15:27:59 -0500
-Subject: [PATCH] xf86-video-intel: Split framebuffer and flip crtcs.
-
-Try to allocate a separate framebuffer for each CRTC and flip those
-directly with the back-buffer of updated drawables. This avoids
-blitting content when the drawable size matches the crtc size.
-
-When CopyRegion is used top copy content into or out of the screen
-buffer, it may be redirected to exactly one scanout buffer. This is
-enough to support our one-drawable-per-crtc case, but not sufficient
-in general.
-
-This change also moves page flip state that was previously centralized
-in the intel_mode structure into the intel_crtc structure associated
-with the reference crtc for a flip. This allows flips to pending on
-multiple pipes simultaneously.
-
-Tested with the WebGL aquarium and space rocks demos, a Youtube
-video and WebKit poster circle demo. Added and removed displays while
-active and while suspended.
----
- src/intel.h         |   55 ++++-
- src/intel_display.c |  685 ++++++++++++++++++++++++++++++++++++++++++---------
- src/intel_dri.c     |  180 ++++++++++++--
- src/intel_driver.c  |   10 +
- src/intel_uxa.c     |   48 ++++
- src/intel_video.c   |   11 +-
- 6 files changed, 851 insertions(+), 138 deletions(-)
-
-diff --git a/src/intel.h b/src/intel.h
-index 22527df..99b2cfe 100644
---- a/src/intel.h
-+++ b/src/intel.h
-@@ -185,6 +185,8 @@ struct intel_pixmap {
- 	int8_t batch_write :1;
- 	int8_t offscreen :1;
- 	int8_t pinned :1;
-+
-+	uint32_t fb;
- };
- 
- #if HAS_DEVPRIVATEKEYREC
-@@ -429,6 +431,7 @@ typedef struct intel_screen_private {
- 	Bool has_kernel_flush;
- 	Bool needs_flush;
- 	Bool use_shadow;
-+	Bool use_split_framebuffer;
- 
- 	struct _DRI2FrameEvent *pending_flip[2];
- 
-@@ -462,15 +465,43 @@ extern void intel_mode_init(struct intel_screen_private *intel);
- extern void intel_mode_remove_fb(intel_screen_private *intel);
- extern void intel_mode_fini(intel_screen_private *intel);
- 
-+extern void intel_pixmap_remove_fb(intel_screen_private *intel, PixmapPtr pixmap);
-+
- extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
- extern int intel_crtc_id(xf86CrtcPtr crtc);
- extern int intel_output_dpms_status(xf86OutputPtr output);
- extern void intel_copy_fb(ScrnInfoPtr pScrn);
- 
-+struct intel_scanout {
-+	PixmapPtr pixmap;
-+	BoxRec area; /* area of the virtual screen provided by this scanout */
-+};
-+
-+/* Splits the screen buffer into one scanout per distinct crtc region. */
-+extern Bool intel_split_fb(intel_screen_private *intel);
-+
-+/* Merges any scanouts into the screen buffer. */
-+extern void intel_merge_fb(intel_screen_private *intel);
-+
-+/* Finds a scanout that exactly matches the area, and stores it in |out_scanout|.
-+ * Will return FALSE if any scanout partially intersects the area. If no scanout
-+ * includes the area, will return TRUE with |out_scanout| set to NULL.
-+ */
-+extern Bool intel_find_scanout(intel_screen_private *intel, BoxPtr area,
-+			       struct intel_scanout **out_scanout);
-+
-+/* Finds a scanout that contains the area, and stores it in |out_scanout|.
-+ * Will return FALSE if any scanout partially intersects the area. If no scanout
-+ * includes the area, will return TRUE with |out_scanout| set to NULL.
-+ */
-+extern Bool intel_covering_scanout(intel_screen_private *intel, BoxPtr area,
-+				   struct intel_scanout **out_scanout);
-+
- enum DRI2FrameEventType {
- 	DRI2_SWAP,
- 	DRI2_SWAP_CHAIN,
--	DRI2_FLIP,
-+	DRI2_FLIP_FRONT,
-+	DRI2_FLIP_SPLIT,
- 	DRI2_WAITMSC,
- };
- 
-@@ -495,13 +526,14 @@ typedef struct _DRI2FrameEvent {
- 	void *event_data;
- 	DRI2BufferPtr front;
- 	DRI2BufferPtr back;
-+	BoxRec area; /* screen rectangle being flipped */
- 
- 	struct _DRI2FrameEvent *chain;
- } DRI2FrameEventRec, *DRI2FrameEventPtr;
- 
- extern Bool intel_do_pageflip(intel_screen_private *intel,
--			      dri_bo *new_front,
--			      DRI2FrameEventPtr flip_info, int ref_crtc_hw_id);
-+			      PixmapPtr new_front,
-+			      DRI2FrameEventPtr flip_info);
- 
- static inline intel_screen_private *
- intel_get_screen_private(ScrnInfoPtr scrn)
-@@ -529,6 +561,11 @@ extern void I915EmitInvarientState(ScrnInfoPtr scrn);
- extern void I830EmitFlush(ScrnInfoPtr scrn);
- 
- extern void I830InitVideo(ScreenPtr pScreen);
-+
-+extern void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b);
-+extern void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box);
-+extern void intel_drawable_box(DrawablePtr draw, BoxPtr draw_box);
-+
- extern xf86CrtcPtr intel_covering_crtc(ScrnInfoPtr scrn, BoxPtr box,
- 				      xf86CrtcPtr desired, BoxPtr crtc_box_ret);
- 
-@@ -734,6 +771,18 @@ void intel_uxa_block_handler(intel_screen_private *intel);
- Bool intel_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table,
- 			      int num_bos);
- 
-+/* Copies a box between pixmaps using intel->uxa_driver. */
-+extern Bool intel_uxa_driver_copy_pixmap(intel_screen_private *intel,
-+					 PixmapPtr src, PixmapPtr dst,
-+					 int src_x, int src_y,
-+					 int dst_x, int dst_y,
-+					 int w, int h);
-+
-+/* Fills a box of a pixmap using intel->uxa_driver. */
-+extern Bool intel_uxa_driver_fill_pixmap(intel_screen_private *intel,
-+					 uint32_t src, PixmapPtr dst,
-+					 int x, int y, int w, int h);
-+
- /* intel_shadow.c */
- void intel_shadow_blt(intel_screen_private *intel);
- void intel_shadow_create(struct intel_screen_private *intel);
-diff --git a/src/intel_display.c b/src/intel_display.c
-index bac3f8f..8908386 100644
---- a/src/intel_display.c
-+++ b/src/intel_display.c
-@@ -44,27 +44,33 @@
- #include "xf86drmMode.h"
- #include "X11/Xatom.h"
- 
-+#define MAX_SCANOUTS (4)
-+
-+enum intel_scanout_state {
-+	INTEL_SCANOUT_INVALID = 0,
-+	INTEL_SCANOUT_FRONT,
-+	INTEL_SCANOUT_SPLIT,
-+};
-+
- struct intel_mode {
- 	int fd;
--	uint32_t fb_id;
- 	drmModeResPtr mode_res;
- 	int cpp;
- 
- 	drmEventContext event_context;
--	DRI2FrameEventPtr flip_info;
--	int old_fb_id;
--	int flip_count;
--	unsigned int fe_frame;
--	unsigned int fe_tv_sec;
--	unsigned int fe_tv_usec;
-+
-+	uint32_t front_fb_id;
-+
-+	int scanout_state;
-+	struct intel_scanout scanouts[MAX_SCANOUTS];
- 
- 	struct list outputs;
- 	struct list crtcs;
- };
- 
- struct intel_pageflip {
--	struct intel_mode *mode;
--	Bool dispatch_me;
-+	struct intel_crtc *reference_crtc;
-+	struct intel_crtc *flipped_crtc;
- };
- 
- struct intel_crtc {
-@@ -72,10 +78,20 @@ struct intel_crtc {
- 	drmModeModeInfo kmode;
- 	drmModeCrtcPtr mode_crtc;
- 	int pipe;
-+
-+	struct {
-+		int pending; /* number of outstanding flip requests */
-+		unsigned int frame;
-+		unsigned int tv_sec;
-+		unsigned int tv_usec;
-+		DRI2FrameEventPtr info;
-+	} flip;
-+
- 	dri_bo *cursor;
- 	dri_bo *rotate_bo;
- 	uint32_t rotate_pitch;
- 	uint32_t rotate_fb_id;
-+
- 	xf86CrtcPtr crtc;
- 	struct list link;
- };
-@@ -109,6 +125,9 @@ struct intel_output {
- };
- 
- static void
-+intel_crtc_merge_scanouts(intel_screen_private *intel);
-+
-+static void
- intel_output_dpms(xf86OutputPtr output, int mode);
- 
- static void
-@@ -330,16 +349,97 @@ intel_crtc_dpms(xf86CrtcPtr intel_crtc, int mode)
- 
- }
- 
-+/* Get a scratch pixmap attached to the current front buffer. This needs to be
-+ * used rather than GetScreenPixmap before the screen is fully initialized,
-+ * and during intel_xf86crtc_resize when the state is inconsistent.
-+ */
-+static PixmapPtr intel_get_scratch_front_pixmap(intel_screen_private *intel)
-+{
-+	ScrnInfoPtr scrn = intel->scrn;
-+	PixmapPtr pixmap;
-+
-+	pixmap = GetScratchPixmapHeader(
-+		scrn->pScreen,
-+		scrn->virtualX,
-+		scrn->virtualY,
-+		scrn->depth,
-+		scrn->bitsPerPixel,
-+		intel->front_pitch,
-+		NULL);
-+
-+	intel_set_pixmap_bo(pixmap, intel->front_buffer);
-+	return pixmap;
-+}
-+
-+static void intel_free_scratch_front_pixmap(PixmapPtr pixmap)
-+{
-+	if (pixmap == NULL)
-+		return;
-+	intel_set_pixmap_bo(pixmap, NULL);
-+	FreeScratchPixmapHeader(pixmap);
-+}
-+
-+static uint32_t
-+intel_pixmap_ensure_fb(intel_screen_private *intel, PixmapPtr pixmap)
-+{
-+	struct intel_mode *mode = intel->modes;
-+	struct intel_pixmap *intel_pixmap = intel_get_pixmap_private(pixmap);
-+	int ret;
-+
-+	if (intel_pixmap->fb != 0)
-+		return intel_pixmap->fb;
-+
-+	ret = drmModeAddFB(mode->fd,
-+		pixmap->drawable.width,
-+		pixmap->drawable.height,
-+		intel->scrn->depth,
-+		intel->scrn->bitsPerPixel,
-+		intel_pixmap_pitch(pixmap),
-+		intel_get_pixmap_bo(pixmap)->handle,
-+		&intel_pixmap->fb);
-+	if (ret < 0) {
-+		xf86DrvMsg(intel->scrn->scrnIndex, X_ERROR,
-+			   "failed to add fb for pixmap: %s\n",
-+			   strerror(-ret));
-+		return FALSE;
-+	}
-+
-+	return intel_pixmap->fb;
-+}
-+
-+void intel_pixmap_remove_fb(intel_screen_private *intel, PixmapPtr pixmap)
-+{
-+	struct intel_mode *mode = intel->modes;
-+	struct intel_pixmap *intel_pixmap = intel_get_pixmap_private(pixmap);
-+	int ret;
-+
-+	if (intel_pixmap->fb == 0)
-+		return;
-+
-+	ret = drmModeRmFB(mode->fd, intel_pixmap->fb);
-+	if (ret < 0) {
-+		xf86DrvMsg(intel->scrn->scrnIndex, X_ERROR,
-+			   "failed to remove fb for pixmap: %s\n",
-+			   strerror(-ret));
-+	}
-+
-+	intel_pixmap->fb = 0;
-+}
-+
- static Bool
- intel_crtc_apply(xf86CrtcPtr crtc)
- {
- 	ScrnInfoPtr scrn = crtc->scrn;
-+	intel_screen_private *intel = intel_get_screen_private(scrn);
-+	struct intel_mode *mode = intel->modes;
- 	struct intel_crtc *intel_crtc = crtc->driver_private;
--	struct intel_mode *mode = intel_crtc->mode;
-+	BoxRec crtc_box;
-+	struct intel_scanout *scanout;
- 	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
- 	uint32_t *output_ids;
- 	int output_count = 0;
--	int fb_id, x, y;
-+	uint32_t fb_id;
-+	int x, y;
- 	int i, ret = FALSE;
- 
- 	output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
-@@ -372,9 +472,20 @@ intel_crtc_apply(xf86CrtcPtr crtc)
- 			       crtc->gamma_blue, crtc->gamma_size);
- #endif
- 
-+	fb_id = mode->front_fb_id;
- 	x = crtc->x;
- 	y = crtc->y;
--	fb_id = mode->fb_id;
-+
-+	intel_crtc_box(crtc, &crtc_box);
-+	if (!intel_find_scanout(intel, &crtc_box, &scanout)) {
-+		/* partially intersects a scanout; merge everything */
-+		intel_crtc_merge_scanouts(intel);
-+	}
-+	if (scanout != NULL) {
-+		fb_id = intel_pixmap_ensure_fb(intel, scanout->pixmap);
-+		x -= scanout->area.x1;
-+		y -= scanout->area.y1;
-+	}
- 	if (intel_crtc->rotate_fb_id) {
- 		fb_id = intel_crtc->rotate_fb_id;
- 		x = 0;
-@@ -396,7 +507,6 @@ intel_crtc_apply(xf86CrtcPtr crtc)
- 		for (i = 0; i < xf86_config->num_output; i++) {
- 		    xf86OutputPtr output = xf86_config->output[i];
- 		    struct intel_output *intel_output;
--
- 		    if (output->crtc != crtc)
- 			continue;
- 
-@@ -421,20 +531,20 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
- {
- 	ScrnInfoPtr scrn = crtc->scrn;
- 	intel_screen_private *intel = intel_get_screen_private(scrn);
-+	struct intel_mode *intel_mode = intel->modes;
- 	struct intel_crtc *intel_crtc = crtc->driver_private;
--	struct intel_mode *intel_mode = intel_crtc->mode;
- 	int saved_x, saved_y;
- 	Rotation saved_rotation;
- 	DisplayModeRec saved_mode;
--	int ret = TRUE;
--	unsigned int pitch = scrn->displayWidth * intel->cpp;
-+	int ret;
- 
--	if (intel_mode->fb_id == 0) {
-+	if (intel_mode->front_fb_id == 0) {
- 		ret = drmModeAddFB(intel_mode->fd,
- 				   scrn->virtualX, scrn->virtualY,
- 				   scrn->depth, scrn->bitsPerPixel,
--				   pitch, intel->front_buffer->handle,
--				   &intel_mode->fb_id);
-+				   scrn->displayWidth * intel->cpp,
-+				   intel->front_buffer->handle,
-+				   &intel_mode->front_fb_id);
- 		if (ret < 0) {
- 			ErrorF("failed to add fb\n");
- 			return FALSE;
-@@ -454,14 +564,17 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
- 	intel_batch_submit(crtc->scrn);
- 
- 	mode_to_kmode(crtc->scrn, &intel_crtc->kmode, mode);
--	ret = intel_crtc_apply(crtc);
--	if (!ret) {
--		crtc->x = saved_x;
--		crtc->y = saved_y;
--		crtc->rotation = saved_rotation;
--		crtc->mode = saved_mode;
--	}
--	return ret;
-+	if (!intel_crtc_apply(crtc))
-+		goto error_undo;
-+
-+	return TRUE;
-+
-+error_undo:
-+	crtc->x = saved_x;
-+	crtc->y = saved_y;
-+	crtc->rotation = saved_rotation;
-+	crtc->mode = saved_mode;
-+	return FALSE;
- }
- 
- static void
-@@ -1349,31 +1462,51 @@ intel_output_init(ScrnInfoPtr scrn, struct intel_mode *mode, int num)
- 	list_add(&intel_output->link, &mode->outputs);
- }
- 
-+static void
-+intel_destroy_scanout(struct intel_scanout *scanout)
-+{
-+	if (!scanout)
-+		return;
-+
-+	if (scanout->pixmap) {
-+		intel_set_pixmap_bo(scanout->pixmap, NULL);
-+		FreeScratchPixmapHeader(scanout->pixmap);
-+	}
-+	memset(scanout, 0, sizeof(*scanout));
-+}
-+
- static Bool
- intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
- {
- 	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
--	struct intel_crtc *intel_crtc = xf86_config->crtc[0]->driver_private;
--	struct intel_mode *mode = intel_crtc->mode;
- 	intel_screen_private *intel = intel_get_screen_private(scrn);
-+	struct intel_mode *mode = intel->modes;
- 	drm_intel_bo *old_front = NULL;
--	Bool	    ret;
-+	int         ret;
- 	uint32_t    old_fb_id;
- 	int	    i, old_width, old_height, old_pitch;
- 	unsigned long pitch;
- 	uint32_t tiling;
- 
-+	intel_batch_submit(scrn);
-+
- 	if (scrn->virtualX == width && scrn->virtualY == height)
- 		return TRUE;
- 
--	intel_batch_submit(scrn);
-+	for (i = 0; i < MAX_SCANOUTS; i++) {
-+		intel_destroy_scanout(&mode->scanouts[i]);
-+	}
-+	mode->scanout_state = INTEL_SCANOUT_INVALID;
- 
- 	old_width = scrn->virtualX;
- 	old_height = scrn->virtualY;
- 	old_pitch = scrn->displayWidth;
--	old_fb_id = mode->fb_id;
-+	old_fb_id = mode->front_fb_id;
- 	old_front = intel->front_buffer;
- 
-+	intel->front_buffer = NULL;
-+	mode->front_fb_id = 0;
-+
- 	if (intel->back_buffer) {
- 		drm_intel_bo_unreference(intel->back_buffer);
- 		intel->back_buffer = NULL;
-@@ -1390,7 +1523,7 @@ intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
- 	ret = drmModeAddFB(mode->fd, width, height, scrn->depth,
- 			   scrn->bitsPerPixel, pitch,
- 			   intel->front_buffer->handle,
--			   &mode->fb_id);
-+			   &mode->front_fb_id);
- 	if (ret)
- 		goto fail;
- 
-@@ -1426,9 +1559,9 @@ fail:
- 	scrn->virtualX = old_width;
- 	scrn->virtualY = old_height;
- 	scrn->displayWidth = old_pitch;
--	if (old_fb_id != mode->fb_id)
--		drmModeRmFB(mode->fd, mode->fb_id);
--	mode->fb_id = old_fb_id;
-+	if (old_fb_id != mode->front_fb_id)
-+		drmModeRmFB(mode->fd, mode->front_fb_id);
-+	mode->front_fb_id = old_fb_id;
- 
- 	return FALSE;
- }
-@@ -1536,86 +1669,408 @@ void intel_copy_fb(ScrnInfoPtr pScrn)
- 
- }
- 
-+static PixmapPtr intel_create_split_fb(intel_screen_private *intel, int width, int height)
-+{
-+	ScrnInfoPtr scrn = intel->scrn;
-+	drm_intel_bo *pixmap_bo = NULL;
-+	PixmapPtr pixmap = NULL;
-+	unsigned long pitch;
-+	uint32_t tiling;
-+
-+	pixmap_bo = intel_allocate_framebuffer(scrn, width, height, intel->cpp,
-+					       &pitch, &tiling);
-+	if (!pixmap_bo)
-+		goto fail;
-+
-+	pixmap = GetScratchPixmapHeader(scrn->pScreen,
-+					width, height,
-+					scrn->depth,
-+					scrn->bitsPerPixel,
-+					pitch,
-+					NULL);
-+	if (!pixmap)
-+		goto fail;
-+
-+	intel_set_pixmap_bo(pixmap, pixmap_bo);
-+	drm_intel_bo_unreference(pixmap_bo);
-+	pixmap_bo = NULL;
-+
-+	return pixmap;
-+fail:
-+	drm_intel_bo_unreference(pixmap_bo);
-+	return NULL;
-+}
-+
- Bool
--intel_do_pageflip(intel_screen_private *intel,
--		  dri_bo *new_front,
--		  DRI2FrameEventPtr flip_info, int ref_crtc_hw_id)
-+intel_split_fb(intel_screen_private *intel)
- {
- 	ScrnInfoPtr scrn = intel->scrn;
-+	struct intel_mode *mode = intel->modes;
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
--	struct intel_crtc *crtc = config->crtc[0]->driver_private;
--	struct intel_mode *mode = crtc->mode;
--	unsigned int pitch = scrn->displayWidth * intel->cpp;
--	struct intel_pageflip *flip;
--	int i, old_fb_id;
-+	struct intel_scanout *scanout;
-+	PixmapPtr screen_pixmap;
-+	BoxRec crtc_box;
-+	int i, j, old_state;
- 
--	/*
--	 * Create a new handle for the back buffer
--	 */
--	old_fb_id = mode->fb_id;
--	if (drmModeAddFB(mode->fd, scrn->virtualX, scrn->virtualY,
--			 scrn->depth, scrn->bitsPerPixel, pitch,
--			 new_front->handle, &mode->fb_id))
--		goto error_out;
-+	if (mode->scanout_state == INTEL_SCANOUT_SPLIT)
-+		return TRUE; /* nothing to do */
-+
-+	old_state = mode->scanout_state;
-+	mode->scanout_state = INTEL_SCANOUT_SPLIT;
-+
-+	screen_pixmap = intel_get_scratch_front_pixmap(intel);
-+
-+	for (i = 0; i < config->num_crtc; i++) {
-+		xf86CrtcPtr crtc = config->crtc[i];
-+		if (!crtc->enabled)
-+			continue;
-+
-+		intel_crtc_box(crtc, &crtc_box);
-+
-+		for (j = 0; j < MAX_SCANOUTS; j++) {
-+			scanout = &mode->scanouts[j];
-+			if (scanout->pixmap == NULL)
-+				break; /* beyond the last valid entry */
-+
-+			if (crtc_box.x1 == scanout->area.x1 &&
-+			    crtc_box.y1 == scanout->area.y1 &&
-+			    crtc_box.x2 == scanout->area.x2 &&
-+			    crtc_box.y2 == scanout->area.y2)
-+				break; /* already have a scanout for this crtc */
-+		}
-+		if (j == MAX_SCANOUTS) {
-+			xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING,
-+				   "failed to split framebuffer: all scanouts in use\n");
-+			goto fail;
-+		}
-+
-+		if (scanout->pixmap)
-+			continue; /* already have a complete scanout for this crtc */
-+
-+		/* need to allocate a new scanout bo for this crtc */
-+		scanout->pixmap = intel_create_split_fb(intel,
-+				crtc->mode.HDisplay, crtc->mode.VDisplay);
-+		if (!scanout->pixmap) {
-+			xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING,
-+				   "failed to split framebuffer: allocation failure\n");
-+			goto fail;
-+		}
-+
-+		scanout->area.x1 = crtc_box.x1;
-+		scanout->area.y1 = crtc_box.y1;
-+		scanout->area.x2 = crtc_box.x2;
-+		scanout->area.y2 = crtc_box.y2;
-+
-+		if (old_state == INTEL_SCANOUT_FRONT) {
-+			/* copy current content from the front buffer */
-+			intel_uxa_driver_copy_pixmap(intel,
-+				screen_pixmap, scanout->pixmap,
-+				crtc_box.x1, crtc_box.y1, 0, 0,
-+				crtc_box.x2 - crtc_box.x1,
-+				crtc_box.y2 - crtc_box.y1);
-+		}
-+	}
- 
- 	intel_batch_submit(scrn);
- 
--	/*
--	 * Queue flips on all enabled CRTCs
--	 * Note that if/when we get per-CRTC buffers, we'll have to update this.
--	 * Right now it assumes a single shared fb across all CRTCs, with the
--	 * kernel fixing up the offset of each CRTC as necessary.
--	 *
--	 * Also, flips queued on disabled or incorrectly configured displays
--	 * may never complete; this is a configuration error.
--	 */
--	mode->fe_frame = 0;
--	mode->fe_tv_sec = 0;
--	mode->fe_tv_usec = 0;
-+	for (i = 0; i < config->num_crtc; i++) {
-+		xf86CrtcPtr crtc = config->crtc[i];
-+		if (!crtc->enabled)
-+			continue;
-+
-+		if (!intel_crtc_apply(crtc))
-+			goto fail;
-+	}
-+
-+	intel_free_scratch_front_pixmap(screen_pixmap);
-+
-+	return TRUE;
-+
-+fail:
-+	mode->scanout_state = old_state;
-+	intel_free_scratch_front_pixmap(screen_pixmap);
-+	return FALSE;
-+}
-+
-+static void
-+intel_crtc_merge_scanouts(intel_screen_private *intel)
-+{
-+	struct intel_mode *mode = intel->modes;
-+	PixmapPtr screen_pixmap;
-+	int i, old_state;
-+
-+	old_state = mode->scanout_state;
-+	mode->scanout_state = INTEL_SCANOUT_FRONT;
-+
-+	screen_pixmap = intel_get_scratch_front_pixmap(intel);
-+
-+	for (i = 0; i < MAX_SCANOUTS; i++) {
-+		struct intel_scanout *scanout = &mode->scanouts[i];
-+		if (scanout->pixmap == NULL)
-+			continue;
-+
-+		if (old_state == INTEL_SCANOUT_SPLIT) {
-+			/* copy current content from the split buffer */
-+			intel_uxa_driver_copy_pixmap(intel,
-+				scanout->pixmap, screen_pixmap,
-+				0, 0,
-+				scanout->area.x1, scanout->area.y1,
-+				scanout->area.x2 - scanout->area.x1,
-+				scanout->area.y2 - scanout->area.y1);
-+		}
-+
-+		intel_destroy_scanout(scanout);
-+	}
-+
-+	intel_free_scratch_front_pixmap(screen_pixmap);
-+}
-+
-+void
-+intel_merge_fb(intel_screen_private *intel)
-+{
-+	ScrnInfoPtr scrn = intel->scrn;
-+	struct intel_mode *mode = intel->modes;
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
-+	int i;
-+
-+	if (mode->scanout_state == INTEL_SCANOUT_FRONT)
-+		return; /* nothing to do */
-+
-+	intel_crtc_merge_scanouts(intel);
-+	intel_batch_submit(scrn);
- 
- 	for (i = 0; i < config->num_crtc; i++) {
--		if (!config->crtc[i]->enabled)
-+		xf86CrtcPtr crtc = config->crtc[i];
-+		if (!crtc->enabled)
- 			continue;
- 
--		mode->flip_info = flip_info;
--		mode->flip_count++;
-+		if (!intel_crtc_apply(crtc))
-+			continue; /* update as many crtcs as possible */
-+	}
-+}
-+
-+Bool
-+intel_find_scanout(intel_screen_private *intel, BoxPtr area,
-+		   struct intel_scanout **out_scanout)
-+{
-+	struct intel_mode *mode = intel->modes;
-+	BoxRec intersect_box;
-+	int i;
-+
-+	*out_scanout = NULL;
-+
-+	if (mode->scanout_state != INTEL_SCANOUT_SPLIT)
-+		return TRUE; /* always use screen buffer */
-+
-+	for (i = 0; i < MAX_SCANOUTS; i++) {
-+		struct intel_scanout *scanout = &mode->scanouts[i];
-+		if (scanout->pixmap == NULL)
-+			continue;
-+
-+		if (scanout->area.x1 == area->x1 &&
-+		    scanout->area.y1 == area->y1 &&
-+		    scanout->area.x2 == area->x2 &&
-+		    scanout->area.y2 == area->y2) {
-+			*out_scanout = scanout;
-+			return TRUE;
-+		}
-+
-+		intel_box_intersect(&intersect_box, &scanout->area, area);
-+		if (intersect_box.x1 != intersect_box.x2 ||
-+		    intersect_box.y1 != intersect_box.y2) {
-+			/* partial intersection; must merge to use area. */
-+			return FALSE;
-+		}
-+	}
- 
--		crtc = config->crtc[i]->driver_private;
-+	/* did not intersect any scanouts; use the screen. */
-+	return TRUE;
-+}
- 
--		flip = calloc(1, sizeof(struct intel_pageflip));
--		if (flip == NULL) {
-+Bool
-+intel_covering_scanout(intel_screen_private *intel, BoxPtr area,
-+		       struct intel_scanout **out_scanout)
-+{
-+	struct intel_mode *mode = intel->modes;
-+	BoxRec intersect_box;
-+	int i;
-+
-+	*out_scanout = NULL;
-+
-+	if (mode->scanout_state != INTEL_SCANOUT_SPLIT)
-+		return TRUE; /* always use screen buffer */
-+
-+	for (i = 0; i < MAX_SCANOUTS; i++) {
-+		struct intel_scanout *scanout = &mode->scanouts[i];
-+		if (scanout->pixmap == NULL)
-+			continue;
-+
-+		if (scanout->area.x1 <= area->x1 &&
-+		    scanout->area.y1 <= area->y1 &&
-+		    scanout->area.x2 >= area->x2 &&
-+		    scanout->area.y2 >= area->y2) {
-+			*out_scanout = scanout;
-+			return TRUE;
-+		}
-+
-+		intel_box_intersect(&intersect_box, &scanout->area, area);
-+		if (intersect_box.x1 != intersect_box.x2 ||
-+		    intersect_box.y1 != intersect_box.y2) {
-+			/* partial intersection; must merge to use area. */
-+			return FALSE;
-+		}
-+	}
-+
-+	/* did not intersect any scanouts; use the screen. */
-+	return TRUE;
-+}
-+
-+Bool
-+intel_do_pageflip(intel_screen_private *intel,
-+		  PixmapPtr new_front,
-+		  DRI2FrameEventPtr flip_info)
-+{
-+	struct intel_mode *mode = intel->modes;
-+	ScrnInfoPtr scrn = intel->scrn;
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
-+	struct intel_pageflip **flip_data = NULL;
-+	uint32_t new_front_fb_id;
-+	struct intel_crtc *reference_crtc;
-+	BoxRec crtc_box, intersect_box;
-+	int i, ret;
-+
-+	if (mode->scanout_state == INTEL_SCANOUT_INVALID) {
-+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-+			"flip queue failed: scanout state not configured.\n");
-+		return FALSE;
-+	}
-+
-+	new_front_fb_id = intel_pixmap_ensure_fb(intel, new_front);
-+	if (new_front_fb_id == 0)
-+		goto error_undo;
-+
-+	flip_data = calloc(config->num_crtc, sizeof(*flip_data));
-+	if (!flip_data) {
-+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-+			"flip queue failed: memory allocation error.\n");
-+		goto error_undo;
-+	}
-+
-+	/* Find the reference CRTC, check safety and allocate flip data. */
-+	reference_crtc = NULL;
-+	for (i = 0; i < config->num_crtc; i++) {
-+		xf86CrtcPtr crtc = config->crtc[i];
-+		struct intel_crtc *intel_crtc = crtc->driver_private;
-+		if (!crtc->enabled)
-+			continue;
-+
-+		if (flip_info->pipe == intel_crtc->pipe)
-+			reference_crtc = intel_crtc;
-+
-+		intel_crtc_box(crtc, &crtc_box);
-+		intel_box_intersect(&intersect_box, &crtc_box, &flip_info->area);
-+
-+		if (intersect_box.x1 == intersect_box.x2 ||
-+		    intersect_box.y1 == intersect_box.y2) {
-+			/* Skip crtcs unaffected by this update. */
-+			if (reference_crtc == intel_crtc) {
-+				xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-+					"flip queue failed: updated area does "
-+					"not include the reference crtc.\n");
-+				goto error_undo;
-+			}
-+			continue;
-+		}
-+
-+		if (intersect_box.x1 != crtc_box.x1 ||
-+		    intersect_box.y1 != crtc_box.y1 ||
-+		    intersect_box.x2 != crtc_box.x2 ||
-+		    intersect_box.y2 != crtc_box.y2) {
- 			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
--				   "flip queue: carrier alloc failed.\n");
-+				"flip queue failed: updated area partially "
-+				"intersects crtc %d.\n",
-+				crtc_id(intel_crtc));
- 			goto error_undo;
- 		}
- 
--		/* Only the reference crtc will finally deliver its page flip
--		 * completion event. All other crtc's events will be discarded.
--		 */
--		flip->dispatch_me = (intel_crtc_to_pipe(crtc->crtc) == ref_crtc_hw_id);
--		flip->mode = mode;
-+		flip_data[i] = calloc(1, sizeof(**flip_data));
-+		if (!flip_data[i]) {
-+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-+				"flip queue failed: memory allocation error.\n");
-+			goto error_undo;
-+		}
-+	}
-+	if (reference_crtc == NULL) {
-+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-+			"flip queue failed: no reference crtc for pipe %d.\n",
-+			flip_info->pipe);
-+		goto error_undo;
-+	}
-+	if (reference_crtc->flip.info) {
-+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-+			"flip queue failed: reference crtc %d (for pipe %d) "
-+			"already has a flip pending.\n",
-+			crtc_id(reference_crtc),
-+			flip_info->pipe);
-+		goto error_undo;
-+	}
-+
-+	intel_batch_submit(scrn);
-+
-+	reference_crtc->flip.pending = 0;
-+	reference_crtc->flip.frame = 0;
-+	reference_crtc->flip.tv_sec = 0;
-+	reference_crtc->flip.tv_usec = 0;
-+
-+	/* Defer storing the flip info until we have successfully queued all of
-+	 * the flips. If this function returns FALSE, the caller will free the
-+	 * flip_info structure, so any successful flips must not access it.
-+	 */
-+	reference_crtc->flip.info = NULL;
-+
-+	/*
-+	 * Queue flips on all updated CRTCs.
-+	 * Flips queued on disabled or incorrectly-configured crtcs may never
-+	 * complete. This type of configuration error will result in the
-+	 * flip never completing, and leak some objects.
-+	 */
-+	for (i = 0; i < config->num_crtc; i++) {
-+		struct intel_crtc *intel_crtc = config->crtc[i]->driver_private;
-+		if (!flip_data[i])
-+			continue;
-+
-+		flip_data[i]->reference_crtc = reference_crtc;
-+		flip_data[i]->flipped_crtc = intel_crtc;
- 
--		if (drmModePageFlip(mode->fd,
--				    crtc_id(crtc),
--				    mode->fb_id,
--				    DRM_MODE_PAGE_FLIP_EVENT, flip)) {
-+		ret = drmModePageFlip(mode->fd,
-+				      crtc_id(intel_crtc),
-+				      new_front_fb_id,
-+				      DRM_MODE_PAGE_FLIP_EVENT,
-+				      flip_data[i]);
-+		if (ret < 0) {
- 			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
--				   "flip queue failed: %s\n", strerror(errno));
--			free(flip);
-+				"flip queue failed: error flipping crtc %d: %s\n",
-+				crtc_id(intel_crtc), strerror(-ret));
- 			goto error_undo;
- 		}
-+		/* The flip_data object will be freed when the flip completes. */
-+		flip_data[i] = NULL;
-+
-+		reference_crtc->flip.pending++;
- 	}
- 
--	mode->old_fb_id = old_fb_id;
-+	reference_crtc->flip.info = flip_info;
-+	free(flip_data);
- 	return TRUE;
- 
- error_undo:
--	drmModeRmFB(mode->fd, mode->fb_id);
--	mode->fb_id = old_fb_id;
--
--error_out:
--	xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n",
--		   strerror(errno));
-+	if (flip_data) {
-+		/* Free any unused flip data objects. */
-+		for (i = 0; i < config->num_crtc; i++) {
-+			free(flip_data[i]);
-+		}
-+		free(flip_data);
-+	}
- 	return FALSE;
- }
- 
-@@ -1635,31 +2090,33 @@ intel_page_flip_handler(int fd, unsigned int frame, unsigned int tv_sec,
- 			  unsigned int tv_usec, void *event_data)
- {
- 	struct intel_pageflip *flip = event_data;
--	struct intel_mode *mode = flip->mode;
--
--	/* Is this the event whose info shall be delivered to higher level? */
--	if (flip->dispatch_me) {
--		/* Yes: Cache msc, ust for later delivery. */
--		mode->fe_frame = frame;
--		mode->fe_tv_sec = tv_sec;
--		mode->fe_tv_usec = tv_usec;
-+	struct intel_crtc *reference_crtc = flip->reference_crtc;
-+	struct intel_crtc *flipped_crtc = flip->flipped_crtc;
-+
-+	if (reference_crtc == flipped_crtc) {
-+		/* Cache information from the reference crtc's flip for the event handler. */
-+		reference_crtc->flip.frame = frame;
-+		reference_crtc->flip.tv_sec = tv_sec;
-+		reference_crtc->flip.tv_usec = tv_usec;
- 	}
-+
- 	free(flip);
- 
--	/* Last crtc completed flip? */
--	mode->flip_count--;
--	if (mode->flip_count > 0)
-+	/* Was this the last pending flip? */
-+	reference_crtc->flip.pending--;
-+	if (reference_crtc->flip.pending > 0)
- 		return;
- 
--	/* Release framebuffer */
--	drmModeRmFB(mode->fd, mode->old_fb_id);
--
--	if (mode->flip_info == NULL)
-+	if (reference_crtc->flip.info == NULL)
- 		return;
- 
--	/* Deliver cached msc, ust from reference crtc to flip event handler */
--	I830DRI2FlipEventHandler(mode->fe_frame, mode->fe_tv_sec,
--				 mode->fe_tv_usec, mode->flip_info);
-+	/* Deliver cached info from reference crtc to flip event handler */
-+	I830DRI2FlipEventHandler(
-+		reference_crtc->flip.frame,
-+		reference_crtc->flip.tv_sec,
-+		reference_crtc->flip.tv_usec,
-+		reference_crtc->flip.info);
-+	reference_crtc->flip.info = NULL;
- }
- 
- static void
-@@ -1714,6 +2171,7 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp)
- 
- 	for (i = 0; i < mode->mode_res->count_connectors; i++)
- 		intel_output_init(scrn, mode, i);
-+		intel_output_init(scrn, mode, i);
- 
- 	xf86InitialConfiguration(scrn, TRUE);
- 
-@@ -1746,7 +2204,6 @@ intel_mode_init(struct intel_screen_private *intel)
- 		 * feedback on every server generation, so perform the
- 		 * registration within ScreenInit and not PreInit.
- 		 */
--		mode->flip_count = 0;
- 		AddGeneralSocket(mode->fd);
- 		RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
- 					       drm_wakeup_handler, mode);
-@@ -1758,9 +2215,9 @@ intel_mode_remove_fb(intel_screen_private *intel)
- {
- 	struct intel_mode *mode = intel->modes;
- 
--	if (mode->fb_id) {
--		drmModeRmFB(mode->fd, mode->fb_id);
--		mode->fb_id = 0;
-+	if (mode->front_fb_id != 0) {
-+		drmModeRmFB(mode->fd, mode->front_fb_id);
-+		mode->front_fb_id = 0;
- 	}
- }
- 
-@@ -1768,6 +2225,7 @@ void
- intel_mode_fini(intel_screen_private *intel)
- {
- 	struct intel_mode *mode = intel->modes;
-+	int i;
- 
- 	while(!list_is_empty(&mode->crtcs)) {
- 		xf86CrtcDestroy(list_first_entry(&mode->crtcs,
-@@ -1781,8 +2239,9 @@ intel_mode_fini(intel_screen_private *intel)
- 						   link)->output);
- 	}
- 
--	if (mode->fb_id)
--		drmModeRmFB(mode->fd, mode->fb_id);
-+	for (i = 0; i < MAX_SCANOUTS; i++) {
-+		intel_destroy_scanout(&mode->scanouts[i]);
-+	}
- 
- 	/* mode->rotate_fb_id should have been destroyed already */
- 
-diff --git a/src/intel_dri.c b/src/intel_dri.c
-index 938a022..d8768a6 100644
---- a/src/intel_dri.c
-+++ b/src/intel_dri.c
-@@ -457,6 +457,12 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
- 		? drawable : &dstPrivate->pixmap->drawable;
- 	RegionPtr pCopyClip;
- 	GCPtr gc;
-+	BoxRec draw_box;
-+	struct intel_scanout *scanout;
-+
-+	if (pRegion->extents.x1 == pRegion->extents.x2 ||
-+	    pRegion->extents.y1 == pRegion->extents.y2)
-+		return; /* nothing actually being copied */
- 
- 	gc = GetScratchGC(dst->depth, screen);
- 	if (!gc)
-@@ -542,6 +548,22 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
- 		}
- 	}
- 
-+	if (pixmap_is_scanout(get_drawable_pixmap(dst))) {
-+		intel_drawable_box(drawable, &draw_box);
-+		if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL)
-+			intel_merge_fb(intel);
-+		else
-+			dst = &scanout->pixmap->drawable;
-+	}
-+
-+	if (pixmap_is_scanout(get_drawable_pixmap(src))) {
-+		intel_drawable_box(drawable, &draw_box);
-+		if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL)
-+			intel_merge_fb(intel);
-+		else
-+			src = &scanout->pixmap->drawable;
-+	}
-+
- 	/* It's important that this copy gets submitted before the
- 	 * direct rendering client submits rendering for the next
- 	 * frame, but we don't actually need to submit right now.  The
-@@ -764,10 +786,11 @@ i830_dri2_del_frame_event(DrawablePtr drawable, DRI2FrameEventPtr info)
- static void
- I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back)
- {
-+	ScreenPtr pScreen = draw->pScreen;
-+	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
-+	intel_screen_private *intel = intel_get_screen_private(scrn);
- 	I830DRI2BufferPrivatePtr front_priv, back_priv;
- 	struct intel_pixmap *front_intel, *back_intel;
--	ScreenPtr screen;
--	intel_screen_private *intel;
- 	int tmp;
- 
- 	front_priv = front->driverPrivate;
-@@ -784,14 +807,42 @@ I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr bac
- 	intel_set_pixmap_private(front_priv->pixmap, back_intel);
- 	intel_set_pixmap_private(back_priv->pixmap, front_intel);
- 
--	screen = draw->pScreen;
--	intel = intel_get_screen_private(xf86Screens[screen->myNum]);
--
- 	dri_bo_unreference (intel->front_buffer);
- 	intel->front_buffer = back_intel->bo;
- 	dri_bo_reference (intel->front_buffer);
- 
--	intel_set_pixmap_private(screen->GetScreenPixmap(screen), back_intel);
-+	intel_set_pixmap_private(pScreen->GetScreenPixmap(pScreen), back_intel);
-+	back_intel->busy = 1;
-+	front_intel->busy = -1;
-+}
-+
-+static void
-+I830DRI2ExchangeBuffersSplit(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back)
-+{
-+	ScreenPtr pScreen = draw->pScreen;
-+	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
-+	intel_screen_private *intel = intel_get_screen_private(scrn);
-+	I830DRI2BufferPrivatePtr back_priv;
-+	struct intel_pixmap *front_intel, *back_intel;
-+	struct intel_scanout *scanout;
-+	BoxRec draw_box;
-+
-+	back_priv = back->driverPrivate;
-+
-+	intel_drawable_box(draw, &draw_box);
-+	if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL) {
-+		xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING,
-+			   "failed to exchange with scanout");
-+		return;
-+	}
-+
-+	front_intel = intel_get_pixmap_private(scanout->pixmap);
-+	back_intel = intel_get_pixmap_private(back_priv->pixmap);
-+	intel_set_pixmap_private(scanout->pixmap, back_intel);
-+	intel_set_pixmap_private(back_priv->pixmap, front_intel);
-+
-+	back->name = pixmap_flink(back_priv->pixmap);
-+
- 	back_intel->busy = 1;
- 	front_intel->busy = -1;
- }
-@@ -806,16 +857,19 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel,
- 		     DRI2FrameEventPtr info)
- {
- 	I830DRI2BufferPrivatePtr priv = info->back->driverPrivate;
--	drm_intel_bo *new_back, *old_back;
-+	drm_intel_bo *new_back;
- 
- 	if (!intel->use_triple_buffer) {
--		if (!intel_do_pageflip(intel,
--				       intel_get_pixmap_bo(priv->pixmap),
--				       info, info->pipe))
-+		if (!intel_do_pageflip(intel, priv->pixmap, info))
- 			return FALSE;
- 
--		info->type = DRI2_SWAP;
--		I830DRI2ExchangeBuffers(draw, info->front, info->back);
-+		if (info->type == DRI2_FLIP_SPLIT) {
-+			info->type = DRI2_SWAP;
-+			I830DRI2ExchangeBuffersSplit(draw, info->front, info->back);
-+		} else {
-+			info->type = DRI2_SWAP;
-+			I830DRI2ExchangeBuffers(draw, info->front, info->back);
-+		}
- 		return TRUE;
- 	}
- 
-@@ -846,8 +900,7 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel,
- 		intel->back_buffer = NULL;
- 	}
- 
--	old_back = intel_get_pixmap_bo(priv->pixmap);
--	if (!intel_do_pageflip(intel, old_back, info, info->pipe)) {
-+	if (!intel_do_pageflip(intel, priv->pixmap, info)) {
- 		intel->back_buffer = new_back;
- 		return FALSE;
- 	}
-@@ -916,6 +969,79 @@ can_exchange(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back)
- 	return TRUE;
- }
- 
-+static Bool
-+can_exchange_split(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back)
-+{
-+	struct intel_screen_private *intel = intel_get_screen_private(xf86Screens[drawable->pScreen->myNum]);
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(intel->scrn);
-+	I830DRI2BufferPrivatePtr front_priv = front->driverPrivate;
-+	I830DRI2BufferPrivatePtr back_priv = back->driverPrivate;
-+	PixmapPtr front_pixmap = front_priv->pixmap;
-+	PixmapPtr back_pixmap = back_priv->pixmap;
-+	struct intel_pixmap *front_intel = intel_get_pixmap_private(front_pixmap);
-+	struct intel_pixmap *back_intel = intel_get_pixmap_private(back_pixmap);
-+	WindowPtr draw_win;
-+	Bool found_match, found_conflict;
-+	BoxRec draw_box, crtc_box, intersect_box;
-+	int i;
-+
-+	if (drawable == NULL ||
-+	    drawable->type != DRAWABLE_WINDOW ||
-+	    intel->shadow_present ||
-+	    !intel->use_pageflipping ||
-+	    !intel->use_split_framebuffer)
-+		return FALSE;
-+
-+	if (!pixmap_is_scanout(front_pixmap))
-+		return FALSE;
-+
-+	/* Reject cases where the drawable and backing store have different
-+	 * sizes. This occurs occasionally when a resize and an update happen
-+	 * simultaneously. */
-+	if (drawable->width != back_pixmap->drawable.width ||
-+	    drawable->height != back_pixmap->drawable.height)
-+		return FALSE;
-+
-+	/* Reported depth differs because the scanout pixmap has no alpha,
-+         * however the formats are still interchangeable. */
-+	if (front_pixmap->drawable.bitsPerPixel != back_pixmap->drawable.bitsPerPixel ||
-+	    front_intel->tiling != back_intel->tiling)
-+		return FALSE;
-+
-+	/* Can only do a split exchange if the window is completely exposed. */
-+	draw_win = (WindowPtr)drawable;
-+	if (!RegionEqual(&draw_win->clipList, &draw_win->winSize))
-+		return FALSE;
-+
-+	/* Only split if the area matches at least one crtc, and does not
-+	 * partially intersect any crtcs. */
-+	found_match = FALSE;
-+	found_conflict = FALSE;
-+	intel_drawable_box(drawable, &draw_box);
-+	for (i = 0; i < config->num_crtc; i++) {
-+		xf86CrtcPtr crtc = config->crtc[i];
-+		if (!crtc->enabled)
-+			continue;
-+
-+		intel_crtc_box(crtc, &crtc_box);
-+		if (crtc_box.x1 == draw_box.x1 &&
-+		    crtc_box.y1 == draw_box.y1 &&
-+		    crtc_box.x2 == draw_box.x2 &&
-+		    crtc_box.y2 == draw_box.y2) {
-+			/* regions are equal, so can flip with this crtc */
-+			found_match = TRUE;
-+			continue;
-+		}
-+
-+		/* not equal, so any intersection indicates a conflict */
-+		intel_box_intersect(&intersect_box, &draw_box, &crtc_box);
-+		if (intersect_box.x1 != intersect_box.x2 &&
-+		    intersect_box.y1 != intersect_box.y2)
-+			found_conflict = TRUE;
-+	}
-+	return found_match && !found_conflict;
-+}
-+
- void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
- 			       unsigned int tv_usec, DRI2FrameEventPtr swap_info)
- {
-@@ -935,11 +1061,18 @@ void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
- 
- 
- 	switch (swap_info->type) {
--	case DRI2_FLIP:
-+	case DRI2_FLIP_SPLIT:
-+		if (can_exchange_split(drawable, swap_info->front, swap_info->back)) {
-+			if (I830DRI2ScheduleFlip(intel, drawable, swap_info))
-+				return;
-+		}
-+
-+	case DRI2_FLIP_FRONT:
- 		/* If we can still flip... */
--		if (can_exchange(drawable, swap_info->front, swap_info->back) &&
--		    I830DRI2ScheduleFlip(intel, drawable, swap_info))
--			return;
-+		if (can_exchange(drawable, swap_info->front, swap_info->back)) {
-+			if (I830DRI2ScheduleFlip(intel, drawable, swap_info))
-+				return;
-+		}
- 
- 		/* else fall through to exchange/blit */
- 	case DRI2_SWAP: {
-@@ -1124,6 +1257,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 	swap_info->front = front;
- 	swap_info->back = back;
- 	swap_info->pipe = I830DRI2DrawablePipe(draw);
-+	intel_drawable_box(draw, &swap_info->area);
- 
- 	if (!i830_dri2_add_frame_event(swap_info)) {
- 	    free(swap_info);
-@@ -1151,7 +1285,13 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 
- 	/* Flips need to be submitted one frame before */
- 	if (can_exchange(draw, front, back)) {
--		swap_type = DRI2_FLIP;
-+		intel_merge_fb(intel);
-+		swap_type = DRI2_FLIP_FRONT;
-+		flip = 1;
-+	} else if (can_exchange_split(draw, front, back)) {
-+		if (!intel_split_fb(intel))
-+			goto blit_fallback;
-+		swap_type = DRI2_FLIP_SPLIT;
- 		flip = 1;
- 	} else {
- 		/* Using the DRI2_SWAP path defers the back-to-front blit until
-@@ -1163,7 +1303,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 	}
- 	swap_info->type = swap_type;
- 
--	/* Correct target_msc by 'flip' if swap_type == DRI2_FLIP.
-+	/* Correct target_msc by 'flip' if swap_type == DRI2_FLIP_*.
- 	 * Do it early, so handling of different timing constraints
- 	 * for divisor, remainder and msc vs. target_msc works.
- 	 */
-diff --git a/src/intel_driver.c b/src/intel_driver.c
-index cdd7713..12ff9a1 100644
---- a/src/intel_driver.c
-+++ b/src/intel_driver.c
-@@ -101,6 +101,7 @@ typedef enum {
-    OPTION_DEBUG_WAIT,
-    OPTION_HOTPLUG,
-    OPTION_RELAXED_FENCING,
-+   OPTION_SPLIT_FRAMEBUFFER,
- } I830Opts;
- 
- static OptionInfoRec I830Options[] = {
-@@ -122,6 +123,7 @@ static OptionInfoRec I830Options[] = {
-    {OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE},
-    {OPTION_HOTPLUG,	"HotPlug",	OPTV_BOOLEAN,	{0},	TRUE},
-    {OPTION_RELAXED_FENCING,	"RelaxedFencing",	OPTV_BOOLEAN,	{0},	TRUE},
-+   {OPTION_SPLIT_FRAMEBUFFER,	"SplitFramebuffer",	OPTV_BOOLEAN,	{0},	TRUE},
-    {-1,			NULL,		OPTV_NONE,	{0},	FALSE}
- };
- /* *INDENT-ON* */
-@@ -669,6 +671,14 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
- 	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Triple buffering? %s\n",
- 		   intel->use_triple_buffer ? "enabled" : "disabled");
- 
-+	intel->use_split_framebuffer =
-+		xf86ReturnOptValBool(intel->Options,
-+				     OPTION_SPLIT_FRAMEBUFFER,
-+				     TRUE);
-+	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Split framebuffer? %s\n",
-+		   intel->use_split_framebuffer ? "enabled" : "disabled");
-+
-+
- 	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s\n",
- 		   intel->tiling & INTEL_TILING_FB ? "tiled" : "linear");
- 	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Pixmaps %s\n",
-diff --git a/src/intel_uxa.c b/src/intel_uxa.c
-index b55b285..c811fbe 100644
---- a/src/intel_uxa.c
-+++ b/src/intel_uxa.c
-@@ -636,6 +636,7 @@ void intel_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo)
- 		if (priv->bo == bo)
- 			return;
- 
-+		intel_pixmap_remove_fb(intel, pixmap);
- 		priv->dst_bound = priv->src_bound = 0;
- 		if (list_is_empty(&priv->batch)) {
- 			dri_bo_unreference(priv->bo);
-@@ -704,6 +705,9 @@ static Bool intel_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access)
- 	dri_bo *bo = priv->bo;
- 	int ret;
- 
-+	if (pixmap_is_scanout(pixmap))
-+		intel_merge_fb(intel);
-+
- 	if (!list_is_empty(&priv->batch) &&
- 	    (access == UXA_ACCESS_RW || priv->batch_write))
- 		intel_batch_submit(scrn);
-@@ -765,8 +769,13 @@ static Bool intel_uxa_put_image(PixmapPtr pixmap,
- 				int w, int h,
- 				char *src, int src_pitch)
- {
-+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
-+	intel_screen_private *intel = intel_get_screen_private(scrn);
- 	struct intel_pixmap *priv;
- 
-+	if (pixmap_is_scanout(pixmap))
-+		intel_merge_fb(intel);
-+
- 	priv = intel_get_pixmap_private(pixmap);
- 	if (!intel_pixmap_is_busy(priv)) {
- 		/* bo is not busy so can be replaced without a stall, upload in-place. */
-@@ -882,6 +891,8 @@ static Bool intel_uxa_get_image(PixmapPtr pixmap,
- 				int w, int h,
- 				char *dst, int dst_pitch)
- {
-+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
-+	intel_screen_private *intel = intel_get_screen_private(scrn);
- 	struct intel_pixmap *priv;
- 	PixmapPtr scratch = NULL;
- 	Bool ret;
-@@ -893,6 +904,24 @@ static Bool intel_uxa_get_image(PixmapPtr pixmap,
- 	 * Also the gpu is much faster at detiling.
- 	 */
- 
-+	if (pixmap_is_scanout(pixmap)) {
-+		struct intel_scanout *scanout;
-+		BoxRec get_box;
-+
-+		get_box.x1 = x;
-+		get_box.x2 = x + w;
-+		get_box.y1 = y;
-+		get_box.y2 = y + h;
-+		if (!intel_covering_scanout(intel, &get_box, &scanout) || scanout == NULL) {
-+			intel_merge_fb(intel);
-+		} else {
-+			/* Adjust the copy to come from the scanout. */
-+			pixmap = scanout->pixmap;
-+			x -= scanout->area.x1;
-+			y -= scanout->area.y1;
-+		}
-+	}
-+
- 	priv = intel_get_pixmap_private(pixmap);
- 	if (intel_pixmap_is_busy(priv) || priv->tiling != I915_TILING_NONE) {
- 		ScreenPtr screen = pixmap->drawable.pScreen;
-@@ -1191,6 +1220,25 @@ intel_limits_init(intel_screen_private *intel)
- 	}
- }
- 
-+Bool
-+intel_uxa_driver_copy_pixmap(intel_screen_private *intel,
-+			     PixmapPtr src, PixmapPtr dst,
-+			     int src_x, int src_y,
-+			     int dst_x, int dst_y,
-+			     int w, int h)
-+{
-+	if (!intel->uxa_driver->check_copy(src, dst, GXcopy, FB_ALLONES))
-+		return FALSE;
-+
-+	if (!intel->uxa_driver->prepare_copy(src, dst, -1, -1,
-+					     GXcopy, FB_ALLONES))
-+		return FALSE;
-+
-+	intel->uxa_driver->copy(dst, src_x, src_y, dst_x, dst_y, w, h);
-+	intel->uxa_driver->done_copy(dst);
-+	return TRUE;
-+}
-+
- Bool intel_uxa_init(ScreenPtr screen)
- {
- 	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
-diff --git a/src/intel_video.c b/src/intel_video.c
-index 021ca5f..17fd0d7 100644
---- a/src/intel_video.c
-+++ b/src/intel_video.c
-@@ -1033,7 +1033,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv,
- 	return TRUE;
- }
- 
--static void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b)
-+void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b)
- {
- 	dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1;
- 	dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2;
-@@ -1043,7 +1043,7 @@ static void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b)
- 		dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0;
- }
- 
--static void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box)
-+void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box)
- {
- 	if (crtc->enabled) {
- 		crtc_box->x1 = crtc->x;
-@@ -1056,6 +1056,13 @@ static void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box)
- 		crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0;
- }
- 
-+void intel_drawable_box(DrawablePtr draw, BoxPtr draw_box) {
-+	draw_box->x1 = draw->x;
-+	draw_box->x2 = draw->x + draw->width;
-+	draw_box->y1 = draw->y;
-+	draw_box->y2 = draw->y + draw->height;
-+}
-+
- static int intel_box_area(BoxPtr box)
- {
- 	return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1);
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild
deleted file mode 100644
index 3183eb4fae..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0.ebuild,v 1.1 2011/08/11 15:51:43 chithanh Exp $
-
-EAPI=4
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="amd64 ~ia64 x86 -x86-fbsd"
-IUSE="dri sna xvmc broken_partialswaps"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	xvmc? (
-		x11-libs/libXvMC
-	)
-	>=x11-libs/libxcb-1.5
-	>=x11-libs/libdrm-2.4.23[video_cards_intel]
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6"
-
-PATCHES=(
- 	# Copy the initial framebuffer contents when starting X so we can get
- 	# seamless transitions.
-	"${FILESDIR}/2.16.0-copy-fb.patch"
- 	# Prevent X from touching boot-time gamma settings.
-	"${FILESDIR}/2.14.0-no-gamma.patch"
-	# BLT ring hang fix.
-	"${FILESDIR}/2.16.0-blt-hang.patch"
-	# Disable backlight adjustments on DPMS mode changes.
-	"${FILESDIR}/2.16.0-no-backlight.patch"
-	# Avoid display corruption when unable to flip
-	"${FILESDIR}/2.16.0-fix-blt-damage.patch"
-	# Split framebuffer and flip crtcs indepenently.
-	"${FILESDIR}/2.16.0-per-crtc-flip.patch"
-)
-
-src_prepare() {
-	# Disable triple buffering since we need double buffering
-	# to implement partial updates on top of flips
-	if use broken_partialswaps; then
-		PATCHES+=(
-		"${FILESDIR}/2.16.0-no-triple.patch"
-		)
-	fi
-
-	for patch_file in "${PATCHES[@]}"; do
-		epatch $patch_file
-	done
-}
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	CONFIGURE_OPTIONS="$(use_enable dri) --disable-xvmc --enable-kms-only"
-}
-
-pkg_postinst() {
-	if linux_config_exists \
-		&& ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "              i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest
deleted file mode 100644
index d950086f82..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xf86-video-vesa-2.3.0.tar.bz2 264539 RMD160 7e7c11f6cc094bb898c57d26a70f6c4c0ab83d0f SHA1 4689b7c295d7a8d7326302dafecb812739617134 SHA256 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch
deleted file mode 100644
index e27a355d48..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/vesa.c b/src/vesa.c
-index 61d3550..1136ac3 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -1299,3 +1299,7 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     pVesa->ioBase = pScrn->domainIOBase;
-+#else
-+    pVesa->ioBase = 0;
-+#endif
-
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB, 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch
deleted file mode 100644
index ea3d68a9b3..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1f84310ddf49778f776a39810aa98211c812e8ab Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed, 19 Oct 2011 08:33:07 +0000
-Subject: Build fix for ABI Version 12
-
-ABI Version 12 removes support for multiple PCI domains.  If you need to
-use this driver on a system with more than one PCI domain, you should
-either port this driver to using libpciaccess directly or stick with an
-older server.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 1136ac3..5a0120c 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
- 				    & pVesa->base);
-     }
-     else
--	pVesa->base = xf86MapDomainMemory(pScrn->scrnIndex, 0, pVesa->pciInfo,
--					  pScrn->memPhysBase, pVesa->mapSize);
-+	(void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase,
-+	                             pVesa->mapSize, 
-+	                             PCI_DEV_MAP_FLAG_WRITABLE,
-+	                             & pVesa->base);
- 
-     if (pVesa->base) {
- 	if (pVesa->mapPhys != 0xa0000)
--	    pVesa->VGAbase = xf86MapDomainMemory(pScrn->scrnIndex, 0,
--						 pVesa->pciInfo,
--						 0xa0000, 0x10000);
-+	    (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000,
-+	                                 PCI_DEV_MAP_FLAG_WRITABLE,
-+	                                 & pVesa->VGAbase); 
- 	else
- 	    pVesa->VGAbase = pVesa->base;
- 
-@@ -1325,10 +1327,12 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn)
-     if (pVesa->mapPhys != 0xa0000) {
- 	(void) pci_device_unmap_range(pVesa->pciInfo, pVesa->base,
- 				      pVesa->mapSize);
--	xf86UnMapVidMem(pScrn->scrnIndex, pVesa->VGAbase, 0x10000);
-+	(void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->VGAbase,
-+	                               0x10000);
-     }
-     else {
--	xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
-+	(void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->base,
-+	                               pVesa->mapSize);
-     }
- #else
-     xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch
deleted file mode 100644
index 50ff3d1f2b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -rup xf86-video-vesa-2.3.0.orig/src/vesa.c xf86-video-vesa-2.3.0.work/src/vesa.c
---- xf86-video-vesa-2.3.0.orig/src/vesa.c	2010-01-04 11:19:13.000000000 -0800
-+++ xf86-video-vesa-2.3.0.work/src/vesa.c	2011-03-08 11:06:58.264579000 -0800
-@@ -143,8 +143,6 @@ vesaUpdatePacked(ScreenPtr pScreen, shad
-     shadowUpdatePacked(pScreen, pBuf);
- }
- 
--static Bool VESADGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
--
- enum GenericTypes
- {
-     CHIP_VESA_GENERIC
-@@ -1050,8 +1048,6 @@ VESAScreenInit(int scrnIndex, ScreenPtr 
-         return FALSE;
-     }
- 
--    VESADGAInit(pScrn, pScreen);
--
-     xf86SetBlackWhitePixels(pScreen);
-     miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-@@ -1121,11 +1117,6 @@ VESACloseScreen(int scrnIndex, ScreenPtr
- 	shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
- 	xfree(pVesa->shadow);
-     }
--    if (pVesa->pDGAMode) {
--	xfree(pVesa->pDGAMode);
--	pVesa->pDGAMode = NULL;
--	pVesa->nDGAMode = 0;
--    }
-     pScrn->vtSema = FALSE;
- 
-     pScrn->EnableDisableFBAccess = pVesa->EnableDisableFBAccess;
-@@ -1652,143 +1643,3 @@ VESADisplayPowerManagementSet(ScrnInfoPt
-     VBEDPMSSet(pVesa->pVbe, mode);
- }
- 
--/***********************************************************************
-- * DGA stuff
-- ***********************************************************************/
--static Bool VESADGAOpenFramebuffer(ScrnInfoPtr pScrn, char **DeviceName,
--				   unsigned char **ApertureBase,
--				   int *ApertureSize, int *ApertureOffset,
--				   int *flags);
--static Bool VESADGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode);
--static void VESADGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags);
--
--static Bool
--VESADGAOpenFramebuffer(ScrnInfoPtr pScrn, char **DeviceName,
--		       unsigned char **ApertureBase, int *ApertureSize,
--		       int *ApertureOffset, int *flags)
--{
--    VESAPtr pVesa = VESAGetRec(pScrn);
--
--    *DeviceName = NULL;		/* No special device */
--    *ApertureBase = (unsigned char *)(long)(pVesa->mapPhys);
--    *ApertureSize = pVesa->mapSize;
--    *ApertureOffset = pVesa->mapOff;
--    *flags = DGA_NEED_ROOT;
--
--    return (TRUE);
--}
--
--static Bool
--VESADGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode)
--{
--    DisplayModePtr pMode;
--    int scrnIdx = pScrn->pScreen->myNum;
--    int frameX0, frameY0;
--
--    if (pDGAMode) {
--	pMode = pDGAMode->mode;
--	frameX0 = frameY0 = 0;
--    }
--    else {
--	if (!(pMode = pScrn->currentMode))
--	    return (TRUE);
--
--	frameX0 = pScrn->frameX0;
--	frameY0 = pScrn->frameY0;
--    }
--
--    if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0))
--	return (FALSE);
--    (*pScrn->AdjustFrame)(scrnIdx, frameX0, frameY0, 0);
--
--    return (TRUE);
--}
--
--static void
--VESADGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
--{
--    (*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags);
--}
--
--static int
--VESADGAGetViewport(ScrnInfoPtr pScrn)
--{
--    return (0);
--}
--
--static DGAFunctionRec VESADGAFunctions =
--{
--    VESADGAOpenFramebuffer,
--    NULL,       /* CloseFramebuffer */
--    VESADGASetMode,
--    VESADGASetViewport,
--    VESADGAGetViewport,
--    NULL,       /* Sync */
--    NULL,       /* FillRect */
--    NULL,       /* BlitRect */
--    NULL,       /* BlitTransRect */
--};
--
--static void
--VESADGAAddModes(ScrnInfoPtr pScrn)
--{
--    VESAPtr pVesa = VESAGetRec(pScrn);
--    DisplayModePtr pMode = pScrn->modes;
--    DGAModePtr pDGAMode;
--
--    do {
--	pDGAMode = xrealloc(pVesa->pDGAMode,
--			    (pVesa->nDGAMode + 1) * sizeof(DGAModeRec));
--	if (!pDGAMode)
--	    break;
--
--	pVesa->pDGAMode = pDGAMode;
--	pDGAMode += pVesa->nDGAMode;
--	(void)memset(pDGAMode, 0, sizeof(DGAModeRec));
--
--	++pVesa->nDGAMode;
--	pDGAMode->mode = pMode;
--	pDGAMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE;
--	pDGAMode->byteOrder = pScrn->imageByteOrder;
--	pDGAMode->depth = pScrn->depth;
--	pDGAMode->bitsPerPixel = pScrn->bitsPerPixel;
--	pDGAMode->red_mask = pScrn->mask.red;
--	pDGAMode->green_mask = pScrn->mask.green;
--	pDGAMode->blue_mask = pScrn->mask.blue;
--	pDGAMode->visualClass = pScrn->bitsPerPixel > 8 ?
--	    TrueColor : PseudoColor;
--	pDGAMode->xViewportStep = 1;
--	pDGAMode->yViewportStep = 1;
--	pDGAMode->viewportWidth = pMode->HDisplay;
--	pDGAMode->viewportHeight = pMode->VDisplay;
--
--	pDGAMode->bytesPerScanline = pVesa->maxBytesPerScanline;
--	pDGAMode->imageWidth = pMode->HDisplay;
--	pDGAMode->imageHeight =  pMode->VDisplay;
--	pDGAMode->pixmapWidth = pDGAMode->imageWidth;
--	pDGAMode->pixmapHeight = pDGAMode->imageHeight;
--	pDGAMode->maxViewportX = pScrn->virtualX -
--				    pDGAMode->viewportWidth;
--	pDGAMode->maxViewportY = pScrn->virtualY -
--				    pDGAMode->viewportHeight;
--
--	pDGAMode->address = pVesa->base;
--
--	pMode = pMode->next;
--    } while (pMode != pScrn->modes);
--}
--
--static Bool
--VESADGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen)
--{
--    VESAPtr pVesa = VESAGetRec(pScrn);
--
--    if (pScrn->depth < 8 || pVesa->mapPhys == 0xa0000L)
--	return (FALSE);
--
--    if (!pVesa->nDGAMode)
--	VESADGAAddModes(pScrn);
--
--    return (DGAInit(pScreen, &VESADGAFunctions,
--	    pVesa->pDGAMode, pVesa->nDGAMode));
--}
-Only in xf86-video-vesa-2.3.0.work/src: vesa.c~
-diff -rup xf86-video-vesa-2.3.0.orig/src/vesa.h xf86-video-vesa-2.3.0.work/src/vesa.h
---- xf86-video-vesa-2.3.0.orig/src/vesa.h	2010-01-04 11:19:13.000000000 -0800
-+++ xf86-video-vesa-2.3.0.work/src/vesa.h	2011-03-08 11:01:24.443622000 -0800
-@@ -64,9 +64,6 @@
- /* Int 10 support */
- #include "xf86int10.h"
- 
--/* Dga definitions */
--#include "dgaproc.h"
--
- #include "fb.h"
- 
- #ifdef XSERVER_LIBPCIACCESS
-@@ -108,9 +105,6 @@ typedef struct _VESARec
-     CARD32 windowAoffset;
-     /* Don't override the default refresh rate. */
-     Bool defaultRefresh;
--    /* DGA info */
--    DGAModePtr pDGAMode;
--    int nDGAMode;
-     CloseScreenProcPtr CloseScreen;
-     CreateScreenResourcesProcPtr CreateScreenResources;
-     xf86EnableDisableFBAccessProc *EnableDisableFBAccess;
-Only in xf86-video-vesa-2.3.0.work/src: vesa.h~
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild
deleted file mode 100644
index df0fe20abc..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild,v 1.3 2010/02/08 15:31:28 fauli Exp $
-
-inherit x-modular
-
-DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha amd64 ~ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto"
-PATCHES=(
-	"${FILESDIR}/no-dga.patch"
-	"${FILESDIR}/2.3.0-r1-domainiobase.patch"
-	"${FILESDIR}/2.3.0-r1-xf86MapDomainMemory.patch"
-)
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/Manifest
deleted file mode 100644
index bff262754d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cairo-1.10.2.tar.gz 23558405 RMD160 8c8de00120398fe2b3a60a08ff59a464b2eebf47 SHA1 ccce5ae03f99c505db97c286a0c9a90a926d3c6e SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/cairo-1.10.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/cairo-1.10.2-r2.ebuild
deleted file mode 100644
index f10963cd36..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/cairo-1.10.2-r2.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.9 2011/03/05 17:52:48 xarthisius Exp $
-
-EAPI=3
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
-[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
-
-inherit eutils flag-o-matic autotools ${GIT_ECLASS}
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X aqua debug directfb doc drm gallium opengl openvg qt4 static-libs +svg
-	xcb cairo-perf-trace"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng
-	sys-libs/zlib
-	>=x11-libs/pixman-0.18.4
-	directfb? ( dev-libs/DirectFB )
-	opengl? ( virtual/opengl )
-	openvg? ( media-libs/mesa[gallium] )
-	qt4? ( >=x11-libs/qt-gui-4.4:4 )
-	svg? ( dev-libs/libxml2 )
-	X? (
-		>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft
-		drm? (
-			>=sys-fs/udev-136
-			gallium? ( media-libs/mesa[gallium] )
-		)
-	)
-	xcb? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/libtool-2
-	doc? (
-		>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2
-	)
-	X? (
-		x11-proto/renderproto
-		drm? (
-			x11-proto/xproto
-			>=x11-proto/xextproto-7.1
-		)
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
-	epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
-
-	# Slightly messed build system YAY
-	if [[ ${PV} == *9999* ]]; then
-		touch boilerplate/Makefile.am.features
-		touch src/Makefile.am.features
-		touch ChangeLog
-	fi
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	# upgraded to an eautoreconf for the above interix patch.
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	# tracing fails to compile, because Solaris' libelf doesn't do large files
-	[[ ${CHOST} == *-solaris* ]] && myopts+=" --disable-trace"
-
-	# 128-bits long arithemetic functions are missing
-	[[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=*
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	if use X; then
-		myopts+="
-			--enable-tee=yes
-			$(use_enable drm)
-		"
-
-		if use drm; then
-			myopts+="
-				$(use_enable gallium)
-				$(use_enable xcb xcb-drm)
-			"
-		else
-			use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
-			myopts+="
-				--disable-gallium
-				--disable-xcb-drm
-			"
-		fi
-	else
-		use drm && ewarn "drm use requires X use enabled. So disabling for now."
-		myopts+="
-			--disable-drm
-			--disable-gallium
-			--disable-xcb-drm
-		"
-	fi
-
-	# --disable-xcb-lib:
-	#	do not override good xlib backed by hardforcing rendering over xcb
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable directfb) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable openvg vg) \
-		$(use_enable opengl gl) \
-		$(use_enable qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-src_compile() {
-	emake || die "Build failed"
-
-	if use cairo-perf-trace; then
-		emake -C "${S}/perf" cairo-perf-trace || \
-		    die "cairo-perf-trace build failed"
-	fi
-}
-
-src_install() {
-	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README || die
-
-	if use cairo-perf-trace; then
-		dobin "${S}/perf/.libs/cairo-perf-trace" || die
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index a58c2f8f41..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/cairo/trunk/cairo-1.10.0-buggy_gradients.patch
-http://bugs.gentoo.org/336696
-
---- src/cairo-xlib-display.c
-+++ src/cairo-xlib-display.c
-@@ -353,11 +353,7 @@
-     /* Prior to Render 0.10, there is no protocol support for gradients and
-      * we call function stubs instead, which would silently consume the drawing.
-      */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
-     display->buggy_gradients = TRUE;
--#else
--    display->buggy_gradients = FALSE;
--#endif
-     display->buggy_pad_reflect = FALSE;
-     display->buggy_repeat = FALSE;
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.8.8-interix.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.8.8-interix.patch
deleted file mode 100644
index dc20714ae2..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.8.8-interix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru cairo-1.8.8.orig/build/configure.ac.tools cairo-1.8.8/build/configure.ac.tools
---- cairo-1.8.8.orig/build/configure.ac.tools	2009-09-30 13:36:42 +0200
-+++ cairo-1.8.8/build/configure.ac.tools	2009-09-30 13:50:50 +0200
-@@ -21,5 +21,12 @@
- *) PKGCONFIG_REQUIRES="Requires.private"; ;;
- esac
- 
-+dnl hmm... on interix, things go really bad with Requires.private, since libpng12
-+dnl is missing on the final link commands, so gtk+'s configure checks for cairo
-+dnl fail miserably with unresolved symbols to it.
-+case "$host_os" in
-+interix*) PKGCONFIG_REQUIRES="Requires" ;;
-+esac
-+
- AC_SUBST(PKGCONFIG_REQUIRES)
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/ChangeLog b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/ChangeLog
deleted file mode 100644
index 89ab30cbf6..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/ChangeLog
+++ /dev/null
@@ -1,1916 +0,0 @@
-# ChangeLog for x11-libs/gtk+
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.447 2010/03/11 14:52:23 pacho Exp $
-
-*gtk+-2.18.7-r1 (11 Mar 2010)
-
-  11 Mar 2010; Pacho Ramos <pacho@gentoo.org> +gtk+-2.18.7-r1.ebuild,
-  +files/gtk+-2.18.7-destroy-crash.patch:
-  Fix bug 308985, thanks to Michael Bombach for reporting and finding the
-  fix.
-
-  06 Mar 2010; Pacho Ramos <pacho@gentoo.org> gtk+-2.18.7.ebuild:
-  amd64 stable, bug 304777
-
-  06 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> gtk+-2.18.6.ebuild:
-  x86 stable wrt bug #304777
-
-  06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> gtk+-2.18.6.ebuild:
-  amd64 stable wrt #304777
-
-  23 Feb 2010; Christian Faulhammer <fauli@gentoo.org> gtk+-2.18.7.ebuild:
-  Use libresolv from sys-libs/itx-bin on Interix Prefix
-
-*gtk+-2.18.7 (23 Feb 2010)
-
-  23 Feb 2010; Romain Perier <mrpouet@gentoo.org> +gtk+-2.18.7.ebuild:
-  Version bump, many bugsfixes and translation updates, per bug #306187.
-  Thanks to LeBarJack for tests.
-
-  19 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> gtk+-2.18.5.ebuild,
-  gtk+-2.18.6.ebuild:
-  Require SLOT="0" of media-libs/jpeg wrt #301551.
-
-*gtk+-2.18.6 (15 Jan 2010)
-
-  15 Jan 2010; Romain Perier <mrpouet@gentoo.org> +gtk+-2.18.6.ebuild:
-  Version bump, various bugs fixes and translation update.
-
-  09 Jan 2010; Christian Faulhammer <fauli@gentoo.org> gtk+-2.18.5.ebuild:
-  keyword ~x86-freebsd
-
-  24 Dec 2009; Jonathan Callen <abcd@gentoo.org> gtk+-2.18.5.ebuild,
-  +files/gtk+-2.18.5-macosx-aqua.patch:
-  Add patch for Aqua on Mac OS X; move prefix keywords from overlay
-
-*gtk+-2.18.5 (13 Dec 2009)
-
-  13 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org> -gtk+-2.18.3.ebuild,
-  +gtk+-2.18.5.ebuild:
-  Bump to 2.18.5; remove old -- many bugfixes; a few translation updates
-
-  31 Oct 2009; Nirbheek Chauhan <nirbheek@gentoo.org> gtk+-2.18.3.ebuild:
-  Depend on cairo[svg]; fixes bug 291283 (we probably want to do +svg in
-  cairo)
-
-*gtk+-2.18.3 (29 Oct 2009)
-
-  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> +gtk+-2.18.3.ebuild:
-  New version for GNOME 2.28.
-
-  26 Oct 2009; Raúl Porcel <armin76@gentoo.org> gtk+-2.16.6.ebuild:
-  ia64/sh/sparc stable wrt #285586
-
-  08 Oct 2009; Markus Meier <maekke@gentoo.org> gtk+-2.16.6.ebuild:
-  arm stable, bug #285586
-
-  03 Oct 2009; Tobias Klausmann <klausman@gentoo.org> gtk+-2.16.6.ebuild:
-  Stable on alpha, bug #285586
-
-  30 Sep 2009; Jeroen Roovers <jer@gentoo.org> gtk+-2.16.6.ebuild:
-  Stable for HPPA (bug #285586).
-
-  27 Sep 2009; nixnut <nixnut@gentoo.org> gtk+-2.16.6.ebuild:
-  ppc stable #285586
-
-  25 Sep 2009; Brent Baude <ranger@gentoo.org> gtk+-2.16.6.ebuild:
-  Marking gtk+-2.16.6 ppc64 stable for bug 285586
-
-  22 Sep 2009; Markus Meier <maekke@gentoo.org> gtk+-2.16.6.ebuild:
-  x86 stable, bug #285586
-
-  20 Sep 2009; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.16.6-fix-pltcheck-test.patch, gtk+-2.16.6.ebuild:
-  Fix tests, bug 285698
-
-  20 Sep 2009; Mart Raudsepp <leio@gentoo.org> -gtk+-2.16.1.ebuild,
-  -gtk+-2.16.5.ebuild, -gtk+-2.16.5-r1.ebuild:
-  Remove old
-
-  19 Sep 2009; Olivier Crête <tester@gentoo.org> gtk+-2.16.6.ebuild:
-  Stable on amd64, bug #285586
-
-*gtk+-2.16.6 (19 Sep 2009)
-
-  19 Sep 2009; Mart Raudsepp <leio@gentoo.org> +gtk+-2.16.6.ebuild:
-  Version bump. Various safe bug fixes
-
-*gtk+-2.16.5-r1 (06 Sep 2009)
-
-  06 Sep 2009; Romain Perier <mrpouet@gentoo.org>
-  +gtk+-2.16.5-r1.ebuild,
-  +files/gtk+-2.16.5-jpeg-backward-compatibility.patch:
-  Fix jpeg7 blured images in gdk-pixbuf due to jpeg7 scale specs changes,
-  per bug #282744.
-
-*gtk+-2.16.5 (19 Jul 2009)
-
-  19 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> +gtk+-2.16.5.ebuild:
-  Version bump. Lots of bug fixes, disable tests broken in gentoo env.
-
-*gtk+-2.16.1 (04 May 2009)
-
-  04 May 2009; Gilles Dartiguelongue <eva@gentoo.org> -gtk+-2.10.14.ebuild,
-  +gtk+-2.16.1.ebuild:
-  New version for GNOME 2.26. New GtkOrientable API, a lot of bug fixes and
-  polish all over the place.
-
-  27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gtk+-2.14.7-r2:
-  Stable for HPPA (bug #260063).
-
-  22 Apr 2009; Mart Raudsepp <leio@gentoo.org>
-  -files/gtk+-2.12.1-cupsutils.patch, -gtk+-2.12.8.ebuild,
-  -gtk+-2.14.4.ebuild, -gtk+-2.14.5.ebuild, -gtk+-2.14.7.ebuild,
-  -gtk+-2.14.7-r1.ebuild:
-  Remove old
-
-  12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> ChangeLog:
-  Stable on sparc, bug #260063
-
-  29 Mar 2009; Raúl Porcel <armin76@gentoo.org> gtk+-2.14.7-r2.ebuild:
-  arm/sh/sparc stable
-
-  18 Mar 2009; Raúl Porcel <armin76@gentoo.org> gtk+-2.14.7-r2.ebuild:
-  alpha/ia64 stable wrt #260063
-
-  15 Mar 2009; Markus Meier <maekke@gentoo.org> gtk+-2.14.7-r2.ebuild:
-  x86 stable, bug #260063
-
-  11 Mar 2009; Daniel Gryniewicz <dang@gentoo.org> gtk+-2.14.7-r2.ebuild:
-  Marked stable on amd64
-
-  06 Mar 2009; Brent Baude <ranger@gentoo.org> gtk+-2.14.7-r2.ebuild:
-  Marking gtk+-2.14.7-r2 ppc stable for bug 260063
-
-  05 Mar 2009; Brent Baude <ranger@gentoo.org> gtk+-2.14.7-r2.ebuild:
-  Marking gtk+-2.14.7-r2 ppc64 stable for bug 260063
-
-*gtk+-2.14.7-r2 (01 Mar 2009)
-
-  01 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
-  +files/gtk+-2.14.7-ignore-gtkcurve.patch,
-  +files/gtk+-2.14.7-uncertain-mime.patch, +gtk+-2.14.7-r2.ebuild:
-  Bump to 2.14.7-r2. Hopefully fix test failures, bug #238995, and enhance
-  mime-type resolution, bug #257980.
-
-  15 Feb 2009; Raúl Porcel <armin76@gentoo.org> gtk+-2.12.11.ebuild:
-  arm/sh stable
-
-*gtk+-2.14.7-r1 (29 Jan 2009)
-
-  29 Jan 2009; Daniel Gryniewicz <dang@gentoo.org>
-  +files/gtk+-2.14.7-filechooser.patch, +gtk+-2.14.7-r1.ebuild:
-  Fix for filechooser centering: bug #239360
-
-*gtk+-2.14.7 (15 Jan 2009)
-
-  15 Jan 2009; Mart Raudsepp <leio@gentoo.org> +gtk+-2.14.7.ebuild:
-  Version bump for various bug fixes. This is a stable candidate.
-
-  30 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org> gtk+-2.10.14.ebuild,
-  gtk+-2.12.8.ebuild, gtk+-2.12.11.ebuild, gtk+-2.12.12.ebuild,
-  gtk+-2.14.4.ebuild, gtk+-2.14.5.ebuild:
-  Update comment about preview command, bug #236547.
-
-*gtk+-2.14.5 (27 Nov 2008)
-
-  27 Nov 2008; Mart Raudsepp <leio@gentoo.org>
-  -files/gtk+-2.12.9-filechooser-fix-icon-size.patch,
-  -files/gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch,
-  -files/gtk+-2.12.9-print-backend-64bit.patch,
-  -files/gtk+-2.12.9-treeview-search-window-type.patch,
-  -files/gtk+-2.12.10-fix-get_frame_extents.patch,
-  -files/gtk+-2.12.10-fix-treeview_sort_indicators.patch,
-  -files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch,
-  -files/gtk+-2.14.3-fix-combining-broken-diacritics.patch,
-  -files/gtk+-2.14.3-fix-filesystem-double-free.patch,
-  -files/gtk+-2.14.3-fix-lpr_write-double-free.patch,
-  -files/gtk+-2.14.3-fix-password-dialog-on-mount.patch,
-  -files/gtk+-2.14.3-notebook-tab-draw-correctness.patch,
-  -files/gtk+-2.14.3-reorder-compose-key-table-order.patch,
-  -gtk+-2.12.9-r1.ebuild, -gtk+-2.12.9-r2.ebuild, -gtk+-2.12.10-r1.ebuild,
-  -gtk+-2.14.3-r1.ebuild, -gtk+-2.14.3-r2.ebuild, +gtk+-2.14.5.ebuild:
-  Version bump for various bug fixes. Remove old
-
-  17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
-  files/gtk+-2.10.7-mozilla-dnd-fix.patch:
-  Fix patch with absolute paths.
-
-  13 Nov 2008; Brent Baude <ranger@gentoo.org> gtk+-2.12.11.ebuild:
-  Marking gtk+-2.12.11 ppc64 stable for bug 236971
-
-*gtk+-2.14.4 (19 Oct 2008)
-
-  19 Oct 2008; Mart Raudsepp <leio@gentoo.org> +gtk+-2.14.4.ebuild:
-  Version bump for various bug fixes
-
-  18 Oct 2008; Brent Baude <ranger@gentoo.org> gtk+-2.12.11.ebuild:
-  Marking gtk+-2.12.11 ppc stable for bug 236971
-
-*gtk+-2.14.3-r2 (01 Oct 2008)
-
-  01 Oct 2008; Rémi Cardona <remi@gentoo.org>
-  +files/gtk+-2.14.3-fix-combining-broken-diacritics.patch,
-  +files/gtk+-2.14.3-reorder-compose-key-table-order.patch,
-  +gtk+-2.14.3-r2.ebuild:
-  fix broken diacritics on intl keyboards (see gnome bug #554192)
-
-*gtk+-2.14.3-r1 (29 Sep 2008)
-
-  29 Sep 2008; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch,
-  +files/gtk+-2.14.3-fix-filesystem-double-free.patch,
-  +files/gtk+-2.14.3-fix-lpr_write-double-free.patch,
-  +files/gtk+-2.14.3-fix-password-dialog-on-mount.patch,
-  +files/gtk+-2.14.3-notebook-tab-draw-correctness.patch,
-  -gtk+-2.14.3.ebuild, +gtk+-2.14.3-r1.ebuild:
-  Add a few fixes from upstream unreleased code
-
-  28 Sep 2008; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.14.3-limit-gtksignal-includes.patch, gtk+-2.14.3.ebuild:
-  Adjust a header so that packages using GtkCList will remain buildable
-
-  25 Sep 2008; Jeroen Roovers <jer@gentoo.org> gtk+-2.12.11.ebuild:
-  Stable for HPPA (bug #236971).
-
-*gtk+-2.14.3 (25 Sep 2008)
-
-  25 Sep 2008; Mart Raudsepp <leio@gentoo.org> +gtk+-2.14.3.ebuild:
-  Major version bump. Uses GIO (and indirectly gvfs for remote file support)
-  directly for filechooser, with improved auto-completion; printer dialog
-  can show status information; includes gail accessibility library with
-  other a11y improvements; better keyboard compose sequences; jpeg2000
-  support for gdk-pixbuf with USE=jpeg2k; uses Xrandr for more and better
-  monitor information; new API that helps removing use of libgnome(ui) by
-  applications; and much much more
-
-*gtk+-2.12.12 (22 Sep 2008)
-
-  22 Sep 2008; Mart Raudsepp <leio@gentoo.org> +gtk+-2.12.12.ebuild:
-  Version bump for bug fixes in the 2.12 series
-
-  09 Sep 2008; Raúl Porcel <armin76@gentoo.org> gtk+-2.12.11.ebuild:
-  alpha/ia64/sparc stable wrt #236971
-
-  08 Sep 2008; Markus Meier <maekke@gentoo.org> gtk+-2.12.11.ebuild:
-  x86 stable, bug #236971
-
-  07 Sep 2008; Olivier Crête <tester@gentoo.org> gtk+-2.12.11.ebuild:
-  amd64 stable, bug #236971
-
-  12 Aug 2008; Raúl Porcel <armin76@gentoo.org> gtk+-2.12.10-r1.ebuild:
-  alpha/ia64/sparc stable wrt #229709
-
-  10 Aug 2008; Markus Meier <maekke@gentoo.org> gtk+-2.12.10-r1.ebuild:
-  x86 stable, bug #229709
-
-  31 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org>
-  gtk+-1.2.10-r12.ebuild, -gtk+-2.12.1-r2.ebuild, -gtk+-2.12.5-r1.ebuild,
-  -gtk+-2.12.9.ebuild, -gtk+-2.12.10.ebuild:
-  drop gtk+-1 to ~mips for repoman check.
-  clean up old revisions.
-
-  30 Jul 2008; Brent Baude <ranger@gentoo.org> gtk+-2.12.10-r1.ebuild:
-  Marking gtk+-2.12.10-r1 ppc stable for bug 229709
-
-  26 Jul 2008; Olivier Crête <tester@gentoo.org> gtk+-2.12.10-r1.ebuild:
-  Stable on amd64, bug #229709
-
-*gtk+-2.12.11 (16 Jul 2008)
-
-  16 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org> +gtk+-2.12.11.ebuild:
-  version bump for various bug fixes and translation updates.
-
-*gtk+-2.12.10-r1 (11 Jun 2008)
-
-  11 Jun 2008; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.12.10-fix-get_frame_extents.patch,
-  +files/gtk+-2.12.10-fix-nocxx.patch,
-  +files/gtk+-2.12.10-fix-treeview_sort_indicators.patch,
-  +files/gtk+-2.12.10-no-libintl.patch, +gtk+-2.12.10-r1.ebuild:
-  Fix bug #225339 in gdk_window_get_frame_extents causing window
-  misplacements by various programs; fix sort indicator on treeview not
-  showing in certain circumstances; also include some patches that benefit
-  embedded use cases
-
-  07 Jun 2008; nixnut <nixnut@gentoo.org> gtk+-2.12.9-r2.ebuild:
-  Stable on ppc wrt bug 224817
-
-  07 Jun 2008; Kenneth Prugh <ken69267@gentoo.org> gtk+-2.12.9-r2.ebuild:
-  amd64 stable, bug #224817
-
-  04 Jun 2008; Raúl Porcel <armin76@gentoo.org> gtk+-2.12.9-r2.ebuild:
-  alpha/ia64/sparc stable wrt #224817
-
-  04 Jun 2008; Markus Rothe <corsair@gentoo.org> gtk+-2.12.9-r2.ebuild:
-  Stable on ppc64; bug #224817
-
-  04 Jun 2008; Dawid Węgliński <cla@gentoo.org> gtk+-2.12.9-r2.ebuild:
-  Stable on x86 (bug #224817)
-
-  04 Jun 2008; Jeroen Roovers <jer@gentoo.org> gtk+-2.12.9-r2.ebuild:
-  Stable for HPPA (bug #224817).
-
-*gtk+-2.12.10 (04 Jun 2008)
-
-  04 Jun 2008; Mart Raudsepp <leio@gentoo.org> +gtk+-2.12.10.ebuild:
-  Version bump for various bug fixes
-
-  28 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
-  +files/gtk+-2.12.9-libtool-2.patch, gtk+-2.12.9-r2.ebuild:
-  Fix libtool usage for configure stage, bug #213789. Fix bug #197899 by
-  raising gtk-doc to 1.8 (as per upstream svn).
-
-*gtk+-2.12.9-r2 (10 Apr 2008)
-
-  10 Apr 2008; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.12.9-filechooser-fix-icon-size.patch,
-  +files/gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch,
-  +files/gtk+-2.12.9-print-backend-64bit.patch,
-  +files/gtk+-2.12.9-treeview-search-window-type.patch,
-  +gtk+-2.12.9-r2.ebuild:
-  Fix 64bit printing dialogs, especially seen in Eclipse, bugs 214863 and
-  215318; Improve ~ handling in gtk+ filechooser backend (outside GNOME usage
-  mostly), bug 215146; Also add patches to fix treeview search popup window
-  type for compiz benefits and filechooser icon size inconsistencies that were
-  best seen with GVFS bookmark icons
-
-*gtk+-2.12.9-r1 (26 Mar 2008)
-
-  26 Mar 2008; Rémi Cardona <remi@gentoo.org> +gtk+-2.12.9-r1.ebuild:
-  fix cups support (fixes bug #214017, patch by Octavio Ruiz)
-
-  22 Mar 2008; Daniel Gryniewicz <dang@gentoo.org> gtk+-2.12.8.ebuild:
-  Marked stable on amd64 for bug #212986
-
-*gtk+-2.12.9 (17 Mar 2008)
-
-  17 Mar 2008; Mart Raudsepp <leio@gentoo.org> +gtk+-2.12.9.ebuild:
-  Version bump for mostly bug fixes
-
-  17 Mar 2008; Jeroen Roovers <jer@gentoo.org> gtk+-2.12.8.ebuild:
-  Stable for HPPA (bug #212986).
-
-  15 Mar 2008; nixnut <nixnut@gentoo.org> gtk+-2.12.8.ebuild:
-  Stable on ppc wrt bug 212986
-
-  14 Mar 2008; Raúl Porcel <armin76@gentoo.org> gtk+-2.12.8.ebuild:
-  alpha/ia64/sparc stable wrt #212986
-
-  12 Mar 2008; Christian Faulhammer <opfer@gentoo.org> gtk+-2.12.8.ebuild:
-  stable x86, bug 212986
-
-  12 Mar 2008; Brent Baude <ranger@gentoo.org> gtk+-2.12.8.ebuild:
-  Marking gtk+-2.12.8 ppc64 for bug 212986
-
-*gtk+-2.12.8 (14 Feb 2008)
-
-  14 Feb 2008; Mart Raudsepp <leio@gentoo.org> +gtk+-2.12.8.ebuild:
-  Version bump for assorted bug fixes, including multiple filechooser
-  improvements
-
-  04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gtk+-2.12.5-r1.ebuild:
-  Stable for HPPA (bug #208366).
-
-*gtk+-2.12.7 (03 Feb 2008)
-
-  03 Feb 2008; Mart Raudsepp <leio@gentoo.org> +gtk+-2.12.7.ebuild:
-  Version bump
-
-  03 Feb 2008; Raúl Porcel <armin76@gentoo.org> gtk+-2.12.5-r1.ebuild:
-  alpha/ia64/sparc stable wrt #208366
-
-  02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gtk+-2.12.5-r1.ebuild:
-  Stable on amd64 wrt bug #208366.
-
-  01 Feb 2008; Brent Baude <ranger@gentoo.org> gtk+-2.12.5-r1.ebuild:
-  Marking gtk+-2.12.5-r1 ppc64 and ppc stable for bug 208366
-
-  01 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
-  gtk+-2.12.5-r1.ebuild:
-  stable x86, bug 208366
-
-*gtk+-2.12.5-r1 (13 Jan 2008)
-
-  13 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
-  +gtk+-2.12.5-r1.ebuild:
-  apply flash & OOo fix again (bug #205515)
-
-*gtk+-2.12.5 (10 Jan 2008)
-
-  10 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org> +gtk+-2.12.5.ebuild:
-  bump to 2.12.5, numerous fixes (firefox, OOo, pixbufs, and many more)
-
-  14 Dec 2007; Saleem Abdulrasool <compnerd@gentoo.org>
-  -files/gtk+-2.2.1-disable_icons_smooth_alpha.patch,
-  -files/gtk+-2.4.9-ppc64.patch,
-  -files/gtk+-2.12.0-icon-cache-speedup.patch,
-  -files/gtk+-2.12.0-libtracker_so.patch,
-  -files/gtk+-2.12.0-searchenginesimple-crash-fix.patch,
-  -files/gtk+-2.12.0-swt-tooltips-fix.patch, -files/gtk+-2-xpm_loader.patch,
-  -gtk+-2.6.10-r1.ebuild, -gtk+-2.8.19.ebuild, -gtk+-2.8.20-r1.ebuild,
-  -gtk+-2.10.13.ebuild, -gtk+-2.12.1-r1.ebuild:
-  prune unused versions
-
-  23 Nov 2007; Jeroen Roovers <jer@gentoo.org> gtk+-2.12.1-r2.ebuild:
-  Stable for HPPA (bug #198845).
-
-  23 Nov 2007; Jeroen Roovers <jer@gentoo.org> gtk+-2.12.1-r1.ebuild:
-  Stable for HPPA (bug #198845).
-
-*gtk+-2.12.1-r2 (21 Nov 2007)
-
-  21 Nov 2007; Samuli Suominen <drac@gentoo.org> +gtk+-2.12.1-r2.ebuild:
-  gdk-pixbuf.loaders installation was broken by einstall passing sysconfdir,
-  revert back to using make with destdir wrt #199746.
-
-  20 Nov 2007; Joshua Kinard <kumba@gentoo.org> gtk+-2.12.1-r1.ebuild:
-  Stable on mips, per #198845.
-
-  20 Nov 2007; Joshua Kinard <kumba@gentoo.org> gtk+-2.10.14.ebuild:
-  Stable on mips, per #190019.
-
-  19 Nov 2007; Markus Rothe <corsair@gentoo.org> gtk+-2.12.1-r1.ebuild:
-  Stable on ppc64; bug #198845
-
-  17 Nov 2007; nixnut <nixnut@gentoo.org> gtk+-2.12.1-r1.ebuild:
-  Stable on ppc wrt bug 198845
-
-  14 Nov 2007; Raúl Porcel <armin76@gentoo.org> gtk+-2.12.1-r1.ebuild:
-  sparc stable wrt #198845
-
-  14 Nov 2007; Raúl Porcel <armin76@gentoo.org> gtk+-2.12.1-r1.ebuild:
-  alpha/ia64 stable wrt #198845
-
-  13 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
-  gtk+-2.12.1-r1.ebuild:
-  stable x86, bug 198845
-
-  13 Nov 2007; Mart Raudsepp <leio@gentoo.org> gtk+-2.6.10-r1.ebuild,
-  gtk+-2.8.19.ebuild, gtk+-2.8.20-r1.ebuild, gtk+-2.10.13.ebuild,
-  gtk+-2.10.14.ebuild:
-  QA: Fix quoting of variables in old versions
-
-  13 Nov 2007; Mart Raudsepp <leio@gentoo.org> -gtk+-2.10.11.ebuild,
-  -gtk+-2.12.0-r2.ebuild, -gtk+-2.12.1.ebuild:
-  Remove old unnecessary versions
-
-  12 Nov 2007; Samuli Suominen <drac@gentoo.org> gtk+-2.12.1-r1.ebuild:
-  amd64 stable wrt #198845
-
-*gtk+-2.12.1-r1 (05 Nov 2007)
-
-  05 Nov 2007; Daniel Gryniewicz <dang@gentoo.org>
-  +files/gtk+-2.12.1-cupsutils.patch, +gtk+-2.12.1-r1.ebuild:
-  Bump to 2.12.1-r1
-  	Include patch to fix printing on ppc64; bug #197639
-
-  28 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org> gtk+-2.12.1.ebuild:
-  add vim-syntax support, fix bug #152275
-  add a note about evince being the default backend for printing preview
-
-*gtk+-2.12.1 (20 Oct 2007)
-
-  20 Oct 2007; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.12.1-firefox-print-preview.patch, -gtk+-2.12.0.ebuild,
-  -gtk+-2.12.0-r1.ebuild, +gtk+-2.12.1.ebuild:
-  Version bump. Include patch to fix firefox print preview crash for bug #195644
-
-*gtk+-2.12.0-r2 (25 Sep 2007)
-
-  25 Sep 2007; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.12.0-openoffice-freeze-workaround.patch,
-  +files/gtk+-2.12.0-searchenginesimple-crash-fix.patch,
-  +gtk+-2.12.0-r2.ebuild:
-  Fix a crash in file chooser search functionality and freezes in OpenOffice
-  when ran outside Gnome; upstream bug #480123 and our bug #193513
-  respectively
-
-  25 Sep 2007; Mart Raudsepp <leio@gentoo.org> gtk+-2.12.0-r1.ebuild:
-  QA: Some quoting and other fixes, thanks to Donnie Berkholz
-
-*gtk+-2.12.0-r1 (24 Sep 2007)
-
-  24 Sep 2007; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.12.0-flash-workaround.patch,
-  +files/gtk+-2.12.0-swt-tooltips-fix.patch, +gtk+-2.12.0-r1.ebuild:
-  Hopefully fix netscape-flash crashes and infinite loops and Java SWT
-  tooltips weird behaviour and related crashes. Bug #193513 and part of bug
-  #192310 and self-observation
-
-*gtk+-2.12.0 (21 Sep 2007)
-
-  21 Sep 2007; Rémi Cardona <remi@gentoo.org>
-  +files/gtk+-2.12.0-icon-cache-speedup.patch, +gtk+-2.12.0.ebuild:
-  Add gtk+-2.12.0 (Gnome 2.20)
-
-  21 Sep 2007; Brent Baude <ranger@gentoo.org> gtk+-2.10.14.ebuild:
-  Marking gtk+-2.10.14 ppc64 for bug #190019
-
-  28 Aug 2007; nixnut <nixnut@gentoo.org> gtk+-2.10.14.ebuild:
-  Stable on ppc wrt bug 190019
-
-  28 Aug 2007; Jeroen Roovers <jer@gentoo.org> gtk+-2.10.14.ebuild:
-  Stable for HPPA (bug #190019).
-
-  25 Aug 2007; Raúl Porcel <armin76@gentoo.org> gtk+-2.10.14.ebuild:
-  alpha/ia64/x86 stable wrt #190019
-
-  24 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> gtk+-2.10.14.ebuild:
-  Marked stable on amd64 as per bug 190019.
-
-  24 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.10.14.ebuild:
-  Stable on sparc wrt #190019
-
-  31 Jul 2007; Joshua Kinard <kumba@gentoo.org> gtk+-2.10.13.ebuild:
-  Stable on mips, per #185614.
-
-  23 Jul 2007; nixnut <nixnut@gentoo.org> gtk+-2.10.13.ebuild:
-  Stable on ppc wrt bug 185614
-
-  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-  gtk+-1.2.10-r12.ebuild, gtk+-2.6.10-r1.ebuild, gtk+-2.8.19.ebuild,
-  gtk+-2.8.20-r1.ebuild:
-  Drop virtual/x11 references.
-
-  19 Jul 2007; Christoph Mende <angelos@gentoo.org> gtk+-2.10.13.ebuild:
-  Stable on amd64 wrt bug #185614
-
-  18 Jul 2007; Raúl Porcel <armin76@gentoo.org> gtk+-2.10.13.ebuild:
-  alpha/ia64/x86 stable wrt #185614
-
-  17 Jul 2007; Jeroen Roovers <jer@gentoo.org> gtk+-2.10.13.ebuild:
-  Stable for HPPA (bug #185614).
-
-  17 Jul 2007; Markus Rothe <corsair@gentoo.org> gtk+-2.10.13.ebuild:
-  Stable on ppc64; bug #185614
-
-  17 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.10.13.ebuild:
-  Stable on sparc wrt #185614
-
-*gtk+-2.10.14 (16 Jul 2007)
-
-  16 Jul 2007; Mart Raudsepp <leio@gentoo.org>
-  -files/gtk+-2.10.7-textview-fix.patch, -gtk+-2.10.6.ebuild,
-  -gtk+-2.10.7-r1.ebuild, -gtk+-2.10.9.ebuild, -gtk+-2.10.12.ebuild,
-  +gtk+-2.10.14.ebuild:
-  Version bump and remove some old versions
-
-  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> gtk+-2.8.19.ebuild,
-  gtk+-2.8.20-r1.ebuild, gtk+-2.10.6.ebuild, gtk+-2.10.7-r1.ebuild,
-  gtk+-2.10.9.ebuild, gtk+-2.10.11.ebuild, gtk+-2.10.12.ebuild,
-  gtk+-2.10.13.ebuild:
-  (QA) RESTRICT clean up.
-
-  27 Jun 2007; Mike Frysinger <vapier@gentoo.org>
-  +files/gtk+-1.2.10-automake.patch, +files/gtk+-1.2.10-cleanup.patch,
-  gtk+-1.2.10-r12.ebuild:
-  Fixup autotool handling #168198.
-
-*gtk+-2.10.13 (14 Jun 2007)
-
-  14 Jun 2007; Mart Raudsepp <leio@gentoo.org> +gtk+-2.10.13.ebuild:
-  Version bump for bug fixes. Should also fix our bug #180669
-
-  02 Jun 2007; Brent Baude <ranger@gentoo.org> gtk+-2.10.11.ebuild:
-  Marking gtk+-2.10.11 ppc stable for bug #171107
-
-  31 May 2007; Jeroen Roovers <jer@gentoo.org> gtk+-2.10.11.ebuild:
-  Stable for HPPA (bug #171107).
-
-  31 May 2007; Daniel Gryniewicz <dang@gentoo.org> gtk+-2.10.11.ebuild:
-  Marked stable on amd64 for bug #171107
-
-  31 May 2007; Brent Baude <ranger@gentoo.org> gtk+-2.10.11.ebuild:
-  Marking gtk+-2.10.11 ppc64 stable for bug #171107
-
-  30 May 2007; Raúl Porcel <armin76@gentoo.org> gtk+-2.10.11.ebuild:
-  alpha/ia64 stable wrt #171107
-
-  29 May 2007; Andrej Kacian <ticho@gentoo.org> gtk+-2.10.11.ebuild:
-  Stable on x86, bug #171107.
-
-  29 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.10.11.ebuild:
-  Stable on sparc wrt #171107
-
-  27 May 2007; Joshua Kinard <kumba@gentoo.org> gtk+-2.10.11.ebuild:
-  Stable on mips.
-
-  26 May 2007; Daniel Gryniewicz <dang@gentoo.org> gtk+-2.10.11.ebuild:
-  icon cache patch shouldn't have gone into .11
-
-  22 May 2007; Daniel Gryniewicz <dang@gentoo.org>
-  +files/gtk+-2.10.11-update-icon-subdirs.patch, gtk+-2.10.11.ebuild,
-  gtk+-2.10.12.ebuild:
-  Add patch to check intelligently for icon cache updates
-
-*gtk+-2.10.12 (03 May 2007)
-
-  03 May 2007; Saleem Abdulrasool <compnerd@gentoo.org>
-  +gtk+-2.10.12.ebuild:
-  Version bump from upstream with numerous bug fixes
-
-  22 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> gtk+-2.10.9.ebuild:
-  Stable on alpha/ia64/ppc wrt bug #163678.
-
-  15 Mar 2007; Markus Rothe <corsair@gentoo.org> gtk+-2.10.9.ebuild:
-  Stable on ppc64; bug #163678
-
-  15 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.10.9.ebuild:
-  Stable on sparc wrt #163678
-
-  15 Mar 2007; Jeroen Roovers <jer@gentoo.org> gtk+-2.10.9.ebuild:
-  Stable for HPPA (bug #163678).
-
-*gtk+-2.10.11 (14 Mar 2007)
-
-  14 Mar 2007; Daniel Gryniewicz <dang@gentoo.org> +gtk+-2.10.11.ebuild:
-  Bump to 2.10.11
-  	- Tons of bug fixes...
-
-  14 Mar 2007; Simon Stelling <blubb@gentoo.org> gtk+-2.10.9.ebuild:
-  stable on amd64; security bug 163678
-
-  14 Mar 2007; Christian Faulhammer <opfer@gentoo.org> gtk+-2.10.9.ebuild:
-  stable x86, bug 163678
-
-  21 Feb 2007; Simon Stelling <blubb@gentoo.org> gtk+-2.10.6.ebuild,
-  gtk+-2.10.9.ebuild:
-  we don't need the use x86 && [[ LIBDIR == lib32 ]] hack anymore
-
-*gtk+-2.10.9 (25 Jan 2007)
-
-  25 Jan 2007; Mart Raudsepp <leio@gentoo.org> +gtk+-2.10.9.ebuild:
-  Version bump
-
-*gtk+-2.10.7-r1 (16 Jan 2007)
-
-  16 Jan 2007; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.10.7-mozilla-dnd-fix.patch, -gtk+-2.10.7.ebuild,
-  +gtk+-2.10.7-r1.ebuild:
-  Fix drag and drop problem in mozilla products, bug 162362
-
-*gtk+-2.10.7 (14 Jan 2007)
-
-  14 Jan 2007; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.10.7-textview-fix.patch, +gtk+-2.10.7.ebuild:
-  Version bump, also fix bug 158179
-
-  10 Jan 2007; Mart Raudsepp <leio@gentoo.org> -gtk+-1.2.10-r11.ebuild:
-  Remove old gtk1 revision
-
-  09 Jan 2007; Mart Raudsepp <leio@gentoo.org>
-  -files/gtk+-gdk-pixbuf-testfix.patch, -gtk+-2.8.8.ebuild,
-  -gtk+-2.8.12.ebuild:
-  Remove some old versions
-
-  06 Jan 2007; Stephen P. Becker <geoman@gentoo.org> gtk+-1.2.10-r12.ebuild:
-  stable on mips
-
-  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> gtk+-2.8.8.ebuild,
-  gtk+-2.8.12.ebuild, gtk+-2.8.19.ebuild, gtk+-2.8.20-r1.ebuild,
-  gtk+-2.10.6.ebuild:
-  Remove debug.eclass usage.
-
-  09 Dec 2006; Bryan Østergaard <kloeri@gentoo.org> gtk+-2.10.6.ebuild:
-  Stable on Alpha.
-
-  07 Dec 2006; Mart Raudsepp <leio@gentoo.org> gtk+-2.10.6.ebuild:
-  Fix the broken syntax in elog for the module rebuild suggestion, bug #157419
-
-  07 Dec 2006; Doug Goldstein <cardoe@gentoo.org> gtk+-2.10.6.ebuild:
-  Removed pdf USE flag check since cairo no longer has the pdf USE flag
-
-  01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.10.6.ebuild:
-  Stable on hppa wrt #156572
-
-  01 Dec 2006; Markus Rothe <corsair@gentoo.org> gtk+-2.10.6.ebuild:
-  Stable on ppc64; bug #156572
-
-  01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.10.6.ebuild:
-  Stable on sparc wrt #156572
-
-  30 Nov 2006; Tobias Scherbaum <dertobi123@gentoo.org> gtk+-2.10.6.ebuild:
-  ppc stable, bug #156572
-
-  30 Nov 2006; Christian Faulhammer <opfer@gentoo.org> gtk+-2.10.6.ebuild:
-  stable x86, bug #156572
-
-  29 Nov 2006; Olivier Crête <tester@gentoo.org> gtk+-2.10.6.ebuild:
-  Stable on amd64 for bugs #156572
-
-  12 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>; gtk+-2.8.8.ebuild,
-  gtk+-2.8.12.ebuild, gtk+-2.8.19.ebuild, gtk+-2.8.20-r1.ebuild,
-  gtk+-2.10.6.ebuild:
-  Remove warning about Nvidia drivers RENDER accel being broken (Andy Ritger,
-  Nvidia). It's reported fixed on >=8756 and current stable is 8776.
-
-  05 Nov 2006; Mart Raudsepp <leio@gentoo.org> gtk+-1.2.10-r12.ebuild:
-  Fix automake dependency, bug #150503
-
-  01 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> gtk+-1.2.10-r12.ebuild:
-  Stable on Alpha, bug 150355.
-
-  20 Oct 2006; Simon Stelling <blubb@gentoo.org> Manifest:
-  repoman broke the manifest
-
-  20 Oct 2006; Simon Stelling <blubb@gentoo.org> gtk+-1.2.10-r12.ebuild:
-  stable on amd64
-
-  19 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> gtk+-2.8.19.ebuild:
-  Stable on Alpha.
-
-  14 Oct 2006; Aron Griffis <agriffis@gentoo.org> gtk+-1.2.10-r12.ebuild:
-  Mark 1.2.10-r12 stable on ia64. #150355
-
-  11 Oct 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
-  gtk+-1.2.10-r12.ebuild:
-  stable on ppc (Bug #150355)
-
-  10 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  gtk+-1.2.10-r12.ebuild:
-  Stable on sparc wrt #150355
-
-  09 Oct 2006; Jeroen Roovers <jer@gentoo.org> gtk+-1.2.10-r12.ebuild:
-  Stable for HPPA (bug #150355).
-
-*gtk+-2.10.6 (07 Oct 2006)
-
-  07 Oct 2006; Mart Raudsepp <leio@gentoo.org>
-  -files/gtk+-2.10.5-buildfile_typo.patch, -gtk+-2.10.4.ebuild,
-  -gtk+-2.10.5.ebuild, +gtk+-2.10.6.ebuild:
-  New version in the 2.10 series
-
-  07 Oct 2006; Markus Rothe <corsair@gentoo.org> gtk+-1.2.10-r12.ebuild:
-  Stable on ppc64; bug #150355
-
-  07 Oct 2006; Andrej Kacian <ticho@gentoo.org> gtk+-1.2.10-r12.ebuild:
-  Stable on x86, bug #150355.
-
-*gtk+-1.2.10-r12 (07 Oct 2006)
-
-  07 Oct 2006; Alin Nastac <mrness@gentoo.org>
-  +files/gtk+-1.2.10-as-needed.patch, +gtk+-1.2.10-r12.ebuild:
-  Strip unsupported languages from LINGUAS (#114797). Fix broken compilation
-  of dependent packages when they're build with LDFLAGS=-Wl,--as-needed
-  (#133819).
-
-*gtk+-2.10.5 (02 Oct 2006)
-
-  02 Oct 2006; Mart Raudsepp <leio@gentoo.org>
-  +files/gtk+-2.10.5-buildfile_typo.patch, +gtk+-2.10.5.ebuild:
-  Version bump for 2.10 series.
-
-*gtk+-2.10.4 (28 Sep 2006)
-
-  28 Sep 2006; Mart Raudsepp <leio@gentoo.org> -gtk+-2.10.2.ebuild,
-  -gtk+-2.10.3.ebuild, +gtk+-2.10.4.ebuild:
-  Add 2.10.4, and clean up older 2.10 versions
-
-  25 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> Manifest:
-  Fix digest
-
-  23 Sep 2006; Markus Rothe <corsair@gentoo.org> gtk+-2.8.19.ebuild,
-  gtk+-2.8.20-r1.ebuild, gtk+-2.10.2.ebuild, gtk+-2.10.3.ebuild:
-  Do not filter -mminimal-toc on ppc64, else it won't build
-
-  15 Sep 2006; John N. Laliberte <allanonjl@gentoo.org> Manifest:
-  fix digest, #147632
-
-  14 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
-  +files/gtk+-gdk-pixbuf-testfix.patch, +gtk+-2.8.8.ebuild:
-  Oops, missed a hard dep on 2.8.8.  Thanks, mr-bones
-
-  13 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> gtk+-2.8.19.ebuild,
-  gtk+-2.8.20-r1.ebuild, gtk+-2.10.2.ebuild, gtk+-2.10.3.ebuild:
-  Only allow upstream-supported CFLAGS.  Bug #133469
-
-  13 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
-  -files/gtk+-gdk-pixbuf-testfix.patch, -gtk+-1.2.10-r10.ebuild,
-  -gtk+-2.8.8.ebuild, -gtk+-2.8.17.ebuild, -gtk+-2.8.18.ebuild,
-  -gtk+-2.8.20.ebuild:
-  Clean up old versions
-
-  12 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> gtk+-2.10.3.ebuild:
-  Remove monolithic X deps
-
-*gtk+-2.10.3 (05 Sep 2006)
-
-  05 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> -gtk+-2.10.0.ebuild,
-  -gtk+-2.10.1.ebuild, +gtk+-2.10.3.ebuild:
-  Add 2.10.3, and clean up older 2.10 versions
-
-  05 Sep 2006; Joshua Kinard <kumba@gentoo.org> gtk+-2.8.19.ebuild:
-  Marked stable on mips.
-
-  04 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  gtk+-1.2.10-r11.ebuild:
-  Stable on sparc
-
-  27 Aug 2006; Saleem Abdulrasool <compnerd@gentoo.org>
-  gtk+-1.2.10-r11.ebuild:
-  Add an if block around the warning for gtkrc as per bug #141253
-
-*gtk+-2.10.2 (26 Aug 2006)
-
-  26 Aug 2006; Saleem Abdulrasool <compnerd@gentoo.org> +gtk+-2.10.2.ebuild:
-  version bump from upstream
-
-  16 Aug 2006; Markus Rothe <corsair@gentoo.org> gtk+-2.8.19.ebuild:
-  Stable on ppc64
-
-  26 Jul 2006; Stefan Schweizer <genstef@gentoo.org> gtk+-2.10.1.ebuild:
-  Pango 1.12 is enough thanks to Todd Merrill <todd.merrill@comcast.net> in
-  bug 141797
-
-*gtk+-2.10.1 (24 Jul 2006)
-
-  24 Jul 2006; Stefan Schweizer <genstef@gentoo.org> +gtk+-2.10.1.ebuild:
-  version bump
-
-  19 Jul 2006; Olivier Crête <tester@gentoo.org> files/digest-gtk+-2.8.19:
-  Fix digest
-
-*gtk+-2.8.20-r1 (18 Jul 2006)
-
-  18 Jul 2006; John N. Laliberte <allanonjl@gentoo.org>
-  +gtk+-2.8.20-r1.ebuild, gtk+-2.10.0.ebuild:
-  we now create a gtkrc file with the fallback theme set to gnome.  fixes #133241
-
-  17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> gtk+-2.8.19.ebuild:
-  Marked stable on amd64 for bug #139612
-
-*gtk+-2.8.20 (17 Jul 2006)
-
-  17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> +gtk+-2.8.20.ebuild:
-  Bump to 2.8.20 and fix bug #140222
-
-  16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> gtk+-2.8.19.ebuild:
-  hppa stable, bug #139612
-
-  14 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> gtk+-2.8.19.ebuild:
-  ppc stable, bug #139612
-
-  12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> gtk+-2.8.19.ebuild:
-  Stable on x86 wrt bug #139612.
-
-  12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> gtk+-2.8.19.ebuild:
-  Stable on x86 wrt bug #139612.
-
-  10 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.8.19.ebuild:
-  Stable on sparc wrt #139612
-
-  08 Jul 2006; Stefan Schweizer <genstef@gentoo.org> gtk+-2.10.0.ebuild:
-  Add elog message about rebuilding the gtk-engines
-
-*gtk+-2.10.0 (05 Jul 2006)
-
-  05 Jul 2006; Stefan Schweizer <genstef@gentoo.org> +gtk+-2.10.0.ebuild:
-  version bump thanks to Milosz Kosobucki <mikomek@poczta.onet.pl> and Josef
-  Reidinger <queen.killer@seznam.cz> in bug 139195
-
-  25 Jun 2006; Javier Villavicencio <the_paya@gentoo.org>
-  gtk+-2.8.19.ebuild:
-  Add ~x86-fbsd keyword.
-
-*gtk+-2.8.19 (16 Jun 2006)
-
-  16 Jun 2006; Leonardo Boshell <leonardop@gentoo.org> +gtk+-2.8.19.ebuild:
-  New release.
-
-*gtk+-2.8.18 (26 May 2006)
-
-  26 May 2006; John N. Laliberte <allanonjl@gentoo.org> -gtk+-2.8.11.ebuild,
-  -gtk+-2.8.13.ebuild, -gtk+-2.8.16.ebuild, +gtk+-2.8.18.ebuild:
-  new version, cleanup old versions.
-
-*gtk+-2.8.17 (01 May 2006)
-
-  01 May 2006; Daniel Gryniewicz <dang@gentoo.org> +gtk+-2.8.17.ebuild:
-  Bump for 2.14.1
-
-  21 Apr 2006; Thomas Cort <tcort@gentoo.org> gtk+-2.8.12.ebuild:
-  Stable on alpha wrt Bug #126321.
-
-  21 Apr 2006; Marinus Schraal <foser@gentoo.org> gtk+-2.8.16.ebuild :
-  Always enable png, so we actually can display icons
-
-  15 Apr 2006; Stephen P. Becker <geoman@gentoo.org> gtk+-2.8.12.ebuild:
-  stable on mips
-
-  12 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> gtk+-1.2.10-r11.ebuild:
-  Add ~x86-fbsd keyword.
-
-  07 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> gtk+-2.8.13.ebuild,
-  gtk+-2.8.16.ebuild:
-  Restrict confcache on gtk+ as it might cause spurious failures during build
-  (not during configure).
-
-  24 Mar 2006; Aron Griffis <agriffis@gentoo.org> gtk+-2.8.12.ebuild:
-  Mark 2.8.12 stable on ia64
-
-  20 Mar 2006; Seemant Kulleen <seemant@gentoo.org> gtk+-2.8.16.ebuild:
-  fix the make check stage which wants to run a gtk+ app (so run it in a
-  virtual X display).
-
-  19 Mar 2006; Markus Rothe <corsair@gentoo.org> gtk+-2.8.12.ebuild:
-  Stable on ppc64
-
-  18 Mar 2006; Olivier Crête <tester@gentoo.org> gtk+-2.8.12.ebuild:
-  Stable on amd64 per bug #126321
-
-  17 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> gtk+-2.8.12.ebuild:
-  Stable on x86 wrt bug #126321.
-
-  17 Mar 2006; Tobias Scherbaum <dertobi123@gentoo.org> gtk+-2.8.12.ebuild:
-  Stable gnome-2.12.3 for ppc, bug #126321
-
-  16 Mar 2006; John N. Laliberte <allanonjl@gentoo.org> gtk+-2.8.16.ebuild:
-  add missing inherit on autotools eclass. fixes #126455
-
-*gtk+-2.8.16 (16 Mar 2006)
-
-  16 Mar 2006; John N. Laliberte <allanonjl@gentoo.org> -gtk+-2.8.15.ebuild,
-  +gtk+-2.8.16.ebuild:
-  new version
-
-  14 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.8.12.ebuild:
-  Stable on hppa
-
-*gtk+-2.8.15 (13 Mar 2006)
-
-  13 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org> +gtk+-2.8.15.ebuild:
-  Version bump from upstream. allanonjl dropped disable_icons_smooth_alpha
-  patch, and bumped glib dependency to 2.10.1.
-
-  13 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.8.12.ebuild:
-  Stable on sparc
-
-*gtk+-2.8.13 (03 Mar 2006)
-
-  03 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org> +gtk+-2.8.13.ebuild:
-  Version bump from upstream
-
-  20 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
-  gtk+-1.2.10-r11.ebuild:
-  Fixing mod-z deps as per bug #123453
-
-  12 Feb 2006; John N. Laliberte <allanonjl@gentoo.org> gtk+-2.8.12.ebuild:
-  add AT_M4DIR to fix compilation when user does not have gtk-doc installed
-
-*gtk+-2.8.12 (12 Feb 2006)
-
-  12 Feb 2006; John N. Laliberte <allanonjl@gentoo.org> +gtk+-2.8.12.ebuild:
-  new version. this includes the patch to fix the slow repainting with ATI
-  cards. remove smoothscroll patch, use eautoreconf.
-
-  12 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  gtk+-1.2.10-r10.ebuild, gtk+-1.2.10-r11.ebuild, gtk+-2.6.10-r1.ebuild:
-  Fix for modular X.
-
-  03 Feb 2006; Aron Griffis <agriffis@gentoo.org> gtk+-2.8.8.ebuild:
-  Mark 2.8.8 stable on ia64
-
-  03 Feb 2006; Guy Martin <gmsoft@gentoo.org> gtk+-2.8.8.ebuild:
-  Stable on hppa.
-
-*gtk+-2.8.11 (29 Jan 2006)
-
-  29 Jan 2006; John N. Laliberte <allanonjl@gentoo.org> -gtk+-2.8.9.ebuild,
-  -gtk+-2.8.10.ebuild, +gtk+-2.8.11.ebuild:
-  version bump. cleanup old ebuilds. remove abicheck.sh patch since it is now
-  applied upstream.
-
-  14 Jan 2006; <dang@gentoo.org> +files/gtk+-2.8.10-xinerama.patch,
-  gtk+-2.8.10.ebuild:
-  Make xinerama support optional. Bug #118744
-
-  13 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> gtk+-2.8.8.ebuild:
-  Stable on alpha wrt bug #117505
-
-*gtk+-2.8.10 (13 Jan 2006)
-
-  13 Jan 2006; John N. Laliberte <allanonjl@gentoo.org>
-  +files/gtk+-gdk-pixbuf-testfix.patch, gtk+-2.8.8.ebuild,
-  gtk+-2.8.9.ebuild, +gtk+-2.8.10.ebuild:
-  apply patch to fix #118722 . Attached patch to gnome bug #317961
-
-  08 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org> gtk+-2.8.8.ebuild:
-  ppc stable, bug #117505
-
-  04 Jan 2006; Mark Loeser <halcy0n@gentoo.org> gtk+-2.8.8.ebuild:
-  Stable on x86; bug #117505
-
-  03 Jan 2006; Luis Medinas <metalgod@gentoo.org> gtk+-2.8.8.ebuild:
-  Stable on amd64. For bug #117505.
-
-  03 Jan 2006; Markus Rothe <corsair@gentoo.org> gtk+-2.8.8.ebuild:
-  Stable on ppc64
-
-  03 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.8.8.ebuild:
-  Stable on sparc wrt #117505
-
-  02 Jan 2006; John N. Laliberte <allanonjl@gentoo.org>
-  -files/gtk+-2.8.6-freebsd.patch, -gtk+-2.6.8.ebuild,
-  -gtk+-2.8.6-r1.ebuild, -gtk+-2.8.7.ebuild, gtk+-2.8.8.ebuild,
-  gtk+-2.8.9.ebuild:
-  cleanup old builds, add informational message about RenderAccel bug, bump
-  atk dep to fix #111741
-
-*gtk+-2.8.9 (13 Dec 2005)
-
-  13 Dec 2005; <dang@gentoo.org> +gtk+-2.8.9.ebuild:
-  New upstream version
-
-  13 Dec 2005; Seemant Kulleen <seemant@gentoo.org> gtk+-1.2.10-r11.ebuild:
-  modular X deps, committing Donnie's fixes in bug #115232
-
-*gtk+-2.8.8 (01 Dec 2005)
-
-  01 Dec 2005; <dang@gentoo.org> +gtk+-2.8.8.ebuild:
-  New upstream release
-
-  20 Nov 2005; Hardave Riar <hardave@gentoo.org> gtk+-2.6.10-r1.ebuild:
-  Stable on mips, bug #112608.
-
-*gtk+-2.8.7 (18 Nov 2005)
-
-  18 Nov 2005; Leonardo Boshell <leonardop@gentoo.org> +gtk+-2.8.7.ebuild:
-  New version. Dropped patches that have been integrated upstream.
-
-*gtk+-2.8.6-r1 (15 Nov 2005)
-*gtk+-2.6.10-r1 (15 Nov 2005)
-
-  15 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
-  +files/gtk+-2-xpm_loader.patch, -gtk+-2.6.10.ebuild,
-  +gtk+-2.6.10-r1.ebuild, -gtk+-2.8.6.ebuild, +gtk+-2.8.6-r1.ebuild:
-  Added patch to fix a probem inside gdk-pixbuf regarding the XPM loader
-  (bug #112608). Marked 2.6.10-r1 stable on all arches that reported back
-  successful testing.
-
-  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> gtk+-2.6.10.ebuild:
-  Stable on hppa, ppc.
-
-  04 Nov 2005; <dang@gentoo.org> gtk+-2.8.6.ebuild:
-  Make sure cairo was built with X. bug 111483
-
-  02 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.6.10.ebuild:
-  Stable on sparc
-
-  01 Nov 2005; John N. Laliberte <allanonjl@gentoo.org> gtk+-2.6.10.ebuild:
-  stable on x86
-
-  31 Oct 2005; Leonardo Boshell <leonardop@gentoo.org> gtk+-2.6.10.ebuild,
-  gtk+-2.8.6.ebuild:
-  Fix logic around GTK2_CONFDIR to make the postinst hook work on binary
-  packages.
-
-  27 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
-  +files/gtk+-2.8.6-freebsd.patch, gtk+-2.8.6.ebuild:
-  Added patch to compile on FreeBSD as per bug #109519.
-
-  22 Oct 2005; Yuta SATOH <nigoro@gentoo.org> gtk+-2.6.8.ebuild,
-  gtk+-2.6.10.ebuild:
-  also fixes #109089 of 2.6.x
-
-  19 Oct 2005; Yuta SATOH <nigoro@gentoo.org> gtk+-2.8.6.ebuild:
-  Fixes #109089 by not applying the patch which fixes the problem of the
-  cursor key for ppc64.
-
-  10 Oct 2005; Hardave Riar <hardave@gentoo.org> gtk+-2.6.8.ebuild:
-  Stable on mips.
-
-*gtk+-2.8.6 (08 Oct 2005)
-
-  08 Oct 2005; Leonardo Boshell <leonardop@gentoo.org> -gtk+-2.8.4.ebuild,
-  +gtk+-2.8.6.ebuild:
-  New version.
-
-*gtk+-2.8.4 (27 Sep 2005)
-
-  27 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
-  -files/gtk+-2.8.3-misc_fixes.patch, -gtk+-2.8.3-r1.ebuild,
-  +gtk+-2.8.4.ebuild:
-  New version.
-
-  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> gtk+-2.6.8.ebuild:
-  Mark 2.6.8 stable on alpha
-
-*gtk+-2.8.3-r1 (04 Sep 2005)
-
-  04 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
-  +files/gtk+-2.8.3-misc_fixes.patch, -gtk+-2.8.3.ebuild,
-  +gtk+-2.8.3-r1.ebuild:
-  Avoid passing --disable-debug. Added patch with various bug fixes from
-  upstream CVS repository.
-
-  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> gtk+-2.6.8.ebuild:
-  Stable on ppc.
-
-  03 Sep 2005; Markus Rothe <corsair@gentoo.org> gtk+-2.6.8.ebuild:
-  Stable on ppc64
-
-*gtk+-2.8.3 (01 Sep 2005)
-
-  01 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
-  -files/gtk+-2.8.0-dep_checks.patch, -files/gtk+-2.8.0-gdk_fix.patch,
-  -gtk+-2.8.0-r2.ebuild, -gtk+-2.8.2.ebuild, +gtk+-2.8.3.ebuild:
-  New version.
-
-  31 Aug 2005; Herbie Hopkins <herbs@gentoo.org> gtk+-2.6.8.ebuild:
-  Stable on amd64.
-
-  29 Aug 2005; Guy Martin <gmsoft@gentoo.org> gtk+-2.6.8.ebuild:
-  Stable on hppa.
-
-  26 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.6.8.ebuild:
-  Stable on sparc
-
-*gtk+-2.8.2 (25 Aug 2005)
-
-  25 Aug 2005; Doug Goldstein <cardoe@gentoo.org> +gtk+-2.8.2.ebuild:
-  rev bump. modular X depends. clean up old cruft from the 2.0.x days.
-
-  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> gtk+-2.6.8.ebuild:
-  stable on ia64
-
-  25 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
-  gtk+-2.6.8.ebuild:
-  Stable on x86.
-
-  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> gtk+-2.6.7.ebuild:
-  stable on ia64
-
-  19 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> gtk+-2.6.10.ebuild,
-  gtk+-2.8.0-r2.ebuild:
-  Fix invocation of epatch (bug #103042).
-
-*gtk+-2.8.0-r2 (19 Aug 2005)
-
-  19 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
-  +files/gtk+-2.8.0-dep_checks.patch, +files/gtk+-2.8.0-gdk_fix.patch,
-  +gtk+-2.8.0-r2.ebuild:
-  Patches from upstream CVS to fix gdk warnings and related side-effects, as
-  wall as sanitizing some dependencies (bug #102854).
-
-*gtk+-2.6.10 (18 Aug 2005)
-
-  18 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> +gtk+-2.6.10.ebuild:
-  New version from the stable branch.
-
-*gtk+-2.8.0-r1 (17 Aug 2005)
-
-  17 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
-  +files/gtk+-2.8.0-multilib.patch, +gtk+-2.8.0-r1.ebuild:
-  Updated the multilib patch for 2.8, bug 101289
-
-*gtk+-2.8.0 (15 Aug 2005)
-
-  15 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> gtk+-2.8.0.ebuild:
-  New version.
-
-*gtk+-2.7.4 (31 Jul 2005)
-
-  31 Jul 2005; Marinus Schraal <foser@gentoo.org> gtk+-2.7.4.ebuild :
-  New release
-
-  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> gtk+-2.6.7.ebuild:
-  stable on mips
-
-*gtk+-2.6.8 (22 Jun 2005)
-
-  22 Jun 2005; Marinus Schraal <foser@gentoo.org> gtk+-2.6.8.ebuild :
-  New release
-
-  12 Jun 2005; Olivier Crête <tester@gentoo.org> gtk+-2.6.7.ebuild:
-  Stable on amd64
-
-  12 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org> gtk+-2.6.7.ebuild:
-  Stable on ppc.
-
-  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> gtk+-2.6.7.ebuild:
-  Stable on alpha.
-
-  10 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org> gtk+-2.6.7.ebuild:
-  Stable on hppa.
-
-  06 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.6.7.ebuild:
-  Stable on sparc
-
-  06 Jun 2005; Markus Rothe <corsair@gentoo.org> gtk+-2.6.7.ebuild:
-  Stable on ppc64
-
-  13 May 2005; Rene Nussbaumer <killerfox@gentoo.org> gtk+-2.6.4-r1.ebuild:
-  stable on hppa
-
-  28 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> gtk+-2.6.4-r1.ebuild:
-  Stable on alpha + ia64.
-
-  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gtk+-2.6.4-r1.ebuild:
-  Stable on ppc.
-
-  20 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gtk+-2.6.4-r1.ebuild:
-  Stable on amd64.
-
-  18 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gtk+-2.6.7.ebuild:
-  Minor multilib cleanup.
-
-*gtk+-2.6.7 (16 Apr 2005)
-
-  16 Apr 2005; foser <foser@gentoo.org> gtk+-2.6.7.ebuild :
-  Updated scroll patch (#85663)
-
-  09 Apr 2005; Markus Rothe <corsair@gentoo.org> gtk+-2.6.4-r1.ebuild:
-  Stable on ppc64
-
-  07 Apr 2005; Simon Stelling <blubb@gentoo.org> gtk+-2.4.14.ebuild:
-  stable on amd64
-
-  02 Apr 2005; Stephen P. Becker <geoman@gentoo.org> gtk+-2.6.4-r1.ebuild:
-  stable on mips
-
-  30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.6.4-r1.ebuild:
-  Stable on sparc
-
-*gtk+-2.6.4-r1 (30 Mar 2005)
-
-  30 Mar 2005; foser <foser@gentoo.org> gtk+-2.6.4-r1.ebuild :
-  Add bmp corruption header fix (#86979)
-  Change location of epunt_cxx so it has some effect
-
-  21 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  gtk+-1.2.10-r11.ebuild:
-  Use the right toolchain compiler.
-
-  09 Mar 2005; Mike Gardiner <obz@gentoo.org> gtk+-2.4.14.ebuild:
-  Keyworded ppc
-
-  08 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.6.2.ebuild:
-  Stable on sparc
-
-  07 Mar 2005; Markus Rothe <corsair@gentoo.org> gtk+-2.6.2.ebuild:
-  Stable on ppc64
-
-  03 Mar 2005; Sven Wegener <swegener@gentoo.org> :
-  Added missing digest entries.
-
-  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> gtk+-2.4.14.ebuild:
-  Stable on alpha.
-
-*gtk+-2.6.2 (05 Feb 2005)
-
-  05 Feb 2005; Joe McCann <joem@gentoo.org> +gtk+-2.6.2.ebuild:
-  New version. File selector and dialogue patches applied upstream and no
-  longer needed
-
-*gtk+-2.6.1-r2 (03 Feb 2005)
-
-  03 Feb 2005; Joe McCann <joem@gentoo.org>
-  +files/gtk+-2.6.1-gtk_dialog.patch, +gtk+-2.6.1-r2.ebuild:
-  Adding upstream patch from bug 80262 as reported by compnerd. Should fix
-  gtk+ apps crashing when focus is called on lable widgets.
-
-  22 Jan 2005; Markus Rothe <corsair@gentoo.org> gtk+-2.6.1-r1.ebuild:
-  Added append-flags -mminimal-toc for ppc64 to let it compile
-
-*gtk+-2.6.1-r1 (17 Jan 2005)
-
-  17 Jan 2005; foser <foser@gentoo.org> gtk+-2.6.1-r1.ebuild :
-  Add upstream patch for http://bugzilla.gnome.org/show_bug.cgi?id=164290
-  block pixmap engine, partially fixes #77791
-
-  13 Jan 2005; Mike Doty <kingtaco@gentoo.org> gtk+-2.6.1.ebuild:
-  amd64 patch update by seemant
-
-  12 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.4.14.ebuild:
-  Stable on sparc
-
-*gtk+-2.6.1 (12 Jan 2005)
-
-  12 Jan 2005; foser <foser@gentoo.org> gtk+-2.6.1.ebuild :
-  New release, closes a whole lot of empty bugs
-
-  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-*gtk+-2.4.9-r2 (26 Dec 2004)
-
-  26 Dec 2004; Markus Rothe <corsair@gentoo.org>
-  +files/gtk+-2.4.9-ppc64.patch, gtk+-2.4.14.ebuild, +gtk+-2.4.9-r2.ebuild:
-  I've added the patch from bug #64359, which fixes a cursor key problem on
-  ppc64 to 2.4.9-r2 and 2.4.14. I marked 2.4.9-r2 stable on ppc64 and will
-  remove this version when 2.4.14 will be marked stable. Credits go to Yuta
-  SATOH.
-
-  24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gtk+-2.4.13-r1.ebuild:
-  Stable on alpha.
-
-  23 Dec 2004; Guy Martin <gmsoft@gentoo.org> gtk+-2.4.13-r1.ebuild:
-  Stable on hppa.
-
-  21 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.4.13-r1.ebuild:
-  Stable on sparc
-
-  20 Dec 2004; Dylan Carlson <absinthe@gentoo.org> gtk+-2.4.13-r1.ebuild:
-  Stable on amd64.
-
-  19 Dec 2004; Mike Gardiner <obz@gentoo.org> gtk+-2.4.13-r1.ebuild:
-  Keyworded x86 and ppc for GNOME 2.8.1
-
-*gtk+-2.4.14 (11 Dec 2004)
-
-  11 Dec 2004; Mike Gardiner <obz@gentoo.org> +gtk+-2.4.14.ebuild:
-  New version of gtk+
-
-*gtk+-2.4.13-r1 (21 Nov 2004)
-
-  21 Nov 2004; foser <foser@gentoo.org> gtk+-2.4.13-r1.ebuild :
-  Add revised smoothscroll patch (#71807), moved patch to mirrors
-
-  02 Nov 2004; Malcolm Lashley <malc@gentoo.org> :
-  Fix missing digest - bug #69859
-
-*gtk+-2.4.13 (02 Nov 2004)
-
-  02 Nov 2004; foser <foser@gentoo.org> gtk+-2.4.13.ebuild :
-  Not so fresh release (#64913)
-  Add correct automake dep (#65796)
-
-  14 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> gtk+-1.2.10-r11.ebuild:
-  Removed ~ppc-macos keyword until bug #57677 is solved.
-
-  11 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> gtk+-1.2.10-r11.ebuild:
-  Added to ~ppc-macos. This closes bug #62069.
-
-  09 Oct 2004; Tom Gall <tgall@gentoo.org> gtk+-2.4.9-r1.ebuild:
-  stable on ppc64, bug #64230
-
-  01 Oct 2004; Stephen P. Becker <geoman@gentoo.org> gtk+-2.4.4.ebuild,
-  gtk+-2.4.9-r1.ebuild:
-  stable on mips
-
-  20 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> gtk+-2.4.9-r1.ebuild:
-  Stable on alpha, bug 64240.
-
-  20 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.4.9-r1.ebuild:
-  Stable on sparc wrt #64230
-
-  20 Sep 2004; <SeJo@gentoo.org> gtk+-2.4.9-r1.ebuild:
-  marked ppc gsla bug: 64230
-
-*gtk+-2.4.9-r1 (20 Sep 2004)
-
-  20 Sep 2004; foser <foser@gentoo.org> gtk+-2.4.9-r1.ebuild, gtk+-2.4.9-ico_xpm_secure.patch :
-  Add security fix for the ico & xpm loaders (#64230)
-
-  30 Aug 2004; Tom Gall <tgall@gentoo.org> gtk+-2.4.4.ebuild:
-  only stable version of gtk+-2.4.3 for ppc64 was removed,
-  marking 2.4.4 stable on an emergancy basis
-
-*gtk+-2.4.9 (29 Aug 2004)
-
-  29 Aug 2004; foser <foser@gentoo.org. gtk+-2.4.9.ebuild :
-  New release
-
-  24 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> gtk+-2.4.4.ebuild:
-  Stable on alpha.
-
-  22 Aug 2004; Travis Tilley <lv@gentoo.org> gtk+-2.4.4.ebuild,
-  gtk+-2.4.7.ebuild:
-  made arch specific config file patch apply on x86 when CONF_LIBDIR=lib32. this
-  is just to make building the emul-linux-x86-gtklibs package easier, and has no
-  effect on x86 users in general.
-
-  22 Aug 2004; Travis Tilley <lv@gentoo.org> gtk+-2.4.4.ebuild,
-  gtk+-2.4.7.ebuild:
-  added a patch that puts the config files for gtk in an arch specific directory
-  on amd64 so that the 32bit and 64bit versions dont clash
-
-*gtk+-2.4.7 (19 Aug 2004)
-
-  19 Aug 2004; foser <foser@gentoo.org> gtk+-2.4.7.ebuild :
-  New release
-  Add smoothscroll patch from gnome bugzilla for testing
-  
-  07 Aug 2004; Travis Tilley <lv@gentoo.org> gtk+-2.4.4.ebuild:
-  stable on amd64
-
-  07 Aug 2004; Michael Hanselmann <hansmi@gentoo.org> gtk+-1.2.10-r11.ebuild:
-  Added gnuconfig to replace config.* on Mac OS X and added to ~macos.
-
-  05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.4.4.ebuild:
-  Stable on sparc
-
-  05 Aug 2004; Guy Martin <gmsoft@gentoo.org> gtk+-2.4.4.ebuild:
-  Stable on hppa.
-
-  31 Jul 2004; <spider@gentoo.org> gtk+-2.4.4.ebuild:
-  stable on x86 for gnome 2.6.2
-
-  27 Jul 2004; <agriffis@gentoo.org> gtk+-1.2.10-r11.ebuild,
-  gtk+-2.4.1.ebuild:
-  stable on alpha (1.2.10-r11) and ia64 (1.2.10-r11, 2.4.1)
-
-  26 Jul 2004; Tom Gall <tgall@gentoo.org> gtk+-1.2.10-r11.ebuild:
-  stable on ppc64
-
-  20 Jul 2004; Tom Gall <tgall@gentoo.org> gtk+-2.4.3-r1.ebuild:
-  stable on ppc64, bug #57154
-
-*gtk+-2.4.4 (11 Jul 2004)
-
-  11 Jul 2004; <spider@gentoo.org> +gtk+-2.4.4.ebuild:
-  Versionbump.
-
-*gtk+-2.4.3-r1 (06 Jul 2004)
-
-  06 Jul 2004; Martin Schlemmer <azarah@gentoo.org>
-  +files/gtk+-2.4.x-filesel-navbuttons.patch.bz2, +gtk+-2.4.3-r1.ebuild:
-  Add fileselect dialog patch from Ximian/Suse.
-
-  02 Jul 2004; Tom Gall <tgall@gentoo.org> gtk+-1.2.10-r11.ebuild:
-  fix repoman dep (imlib)
-
-  28 Jun 2004; Tom Gall <tgall@gentoo.org> gtk+-2.4.3.ebuild:
-  ~ppc64 , bug #54792
-
-  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> gtk+-1.2.10-r10.ebuild:
-  QA - fix use invocation
-
-  19 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> gtk+-2.4.1.ebuild:
-  sparc stable
-
-  16 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> gtk+-2.4.1.ebuild:
-  Stable on alpha.
-
-*gtk+-2.4.3 (15 Jun 2004)
-
-  15 Jun 2004; foser <foser@gentoo.org> gtk+-2.4.3.ebuild :
-  New release (#53700)
-
-  03 Jun 2004; Stephen P. Becker <geoman@gentoo.org> gtk+-2.4.1.ebuild:
-  Stable on mips.
-
-  01 Jun 2004; Travis Tilley <lv@gentoo.org> gtk+-2.4.1.ebuild:
-  stable on amd64
-
-*gtk+-2.4.1 (04 May 2004)
-
-  04 May 2004; foser <foser@gentoo.org> gtk+-2.4.1.ebuild :
-  New release, add patch & dep to have a default icon theme available to the chooser
-
-  26 Apr 2004; Stephen P. Becker <geoman@gentoo.org> gtk+-2.2.4-r1.ebuild:
-  Marked stable on mips.
-
-  22 Apr 2004; Stephen P. Becker <geoman@gentoo.org> gtk+-2.4.0-r1.ebuild:
-  Breaks GNOME 2.4, so returned to ~mips.
-
-  14 Apr 2004; Stephen P. Becker <geoman@gentoo.org> gtk+-1.2.10-r10.ebuild,
-  gtk+-1.2.10-r11.ebuild, gtk+-2.4.0-r1.ebuild:
-  Marked stable on mips.
-
-*gtk+-2.4.0-r1 (09 Apr 2004)
-
-  09 Apr 2004; Travis Tilley <lv@gentoo.org> gtk+-2.4.0-r1.ebuild,
-  files/gtk+-2.4.0-uimanager-zero-becomes-null.patch:
-  added patch to fix a crash in epiphany that may or may not occur only on
-  amd64. for more information on this bug, please refer to
-  http://bugzilla.gnome.org/show_bug.cgi?id=138997
-
-  30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; gtk+-2.2.4-r1.ebuild,
-  gtk+-2.4.0.ebuild:
-  Change x11-base/xfree dependency to virtual/x11. Everyone on xfree should be
-  on 4.3.0-r3 or greater by now, so #20407 shouldn't be an issue.
-
-*gtk+-2.4.0 (18 Mar 2004)
-
-  18 Mar 2004; foser <foser@gentoo.org> gtk+-2.4.0.ebuild :
-  New release
-  Remove incorporated patches
-  Removed wm patch, it's broken
-  Correct license
-  
-  06 Mar 2004; Stephen P. Becker <geoman@gentoo.org> gtk+-1.2.10-r10.ebuild,
-  gtk+-2.2.4-r1.ebuild:
-  Added ~mips keyword.
-
-*gtk+-1.2.10-r11 (05 Feb 2004)
-
-  05 Feb 2004; <spider@gentoo.org> gtk+-1.2.10-r11.ebuild:
-  Minor change to DEPEND, adding an RDEPEND to get intltool out of the RDEPEND
-  set. this deserves a revbump only to make sure that packages get updated.
-
-  07 Dec 2003; foser <foser@gentoo.org> gtk+-1.2.10-r10.ebuild :
-  Fix sysconfdir to /etc to fix gtkrc problems described in #34279
-
-  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> gtk+-1.2.10-r10.ebuild:
-  Stable on ia64
-
-  08 Nov 2003; Todd Sunderlin <todd@gentoo.org> gtk+-2.2.4-r1.ebuild:
-  added sparc keyword
-
-  20 Oct 2003; Aron Griffis <agriffis@gentoo.org> gtk+-2.2.4-r1.ebuild:
-  Stable on alpha
-
-  08 Oct 2003; foser <foser@gentoo.org> gtk+-2.2.4-r1.ebuild :
-  Added patch to fix notification area, submitted by <pat@engsoc.org>
-
-  06 Oct 2003; Mike Gardiner <obz@gentoo.org> gtk+-2.2.4-r1.ebuild:
-  Marked stable on x86
-
-  23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> gtk+-2.2.4-r1.ebuild:
-  set ppc in keywords
-
-*gtk+-2.2.4-r1 (10 Sep 2003)
-
-  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> gtk+-2.2.4-r1.ebuild :
-  Added hppa to KEYWORDS.
-
-  10 Sep 2003; foser <foser@gentoo.org> gtk+-2.2.4-r1.ebuild :
-  Remove USE debug support, the not hardcoded disabling of debugging support 
-  should fix a lot of problems. Rev bump to propagate.
-
-*gtk+-2.2.4 (07 Sep 2003)
-
-  07 Sep 2003; foser <foser@gentoo.org> gtk+-2.2.4.ebuild :
-  New bugfix release
-
-*gtk+-2.2.3 (27 Aug 2003)
-
-  27 Aug 2003; foser <foser@gentoo.org> gtk+-2.2.3.ebuild :
-  New version
-
-  25 Jul 2003; foser <foser@gentoo.org> gtk+-2.2.2-r1.ebuild :
-  Fix xinput (#25203)
-
-  02 Jul 2003; Jason Wever <weeve@gentoo.org> gtk+-2.2.2-r1.ebuild:
-  Changed sparc keyword back to ~sparc to fix broken dependencies.
-
-*gtk+-2.2.2-r1 (12 Jun 2003)
-
-  01 Jul 2003; Guy Martin <gmsoft@gentoo.org> gtk+-2.2.2-r1.ebuild :
-  Added ~hppa to KEYWORDS.
-
-  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> gtk+-2.2.2-r1.ebuild :
-  set stable on sparc
-
-  16 Jun 2003; foser <foser@gentoo.org> gtk+-2.2.2-r1.ebuild, gtk+-2.2.2-gtkwidget_pixmap_expose.patch :
-  Replace reverting patch with correct upstream patch for #22576
-
-  12 Jun 2003; foser <foser@gentoo.org> gtk+-2.2.2-r1.ebuild :
-  Added patch to 'fix' pixbuf corruption issues (#22576)
-
-  10 Jun 2003; Luca Barbato <lu_zero@gentoo.org> gtk+-2.2.2.ebuild :
-  Removed an unnecessary ppc patch.
-
-*gtk+-2.2.2 (10 Jun 2003)
-
-  10 Jun 2003; foser <foser@gentoo.org> gtk+-2.2.2.ebuild :
-  New version, enabled xinput support (#20407) which needs a recent xfree
-  Added GDK_USE_XFT as environment var as suggested by utx
-  
-  30 May 2003; Luca Barbato <lu_zero@gentoo.org> gtk+-2.2.1.ebuild:
-  Added ppc to keywords.
-
-*gtk+-2.2.1-r1 (11 Apr 2003)
-
-  19 Apr 2003; foser <foser@gentoo.org> gtk+-2.2.1-r1.ebuild :
-  Make sure we enable wm patch (better late then never)
-
-  11 Apr 2003; foser <foser@gentoo.org> gtk+-2.2.1-r1.ebuild :
-  Added gtktreeview patch for eclipse (#19084)
-
-*gtk+-1.2.10-r10 (08 Mar 2003)
-
-  01 Jul 2003; Guy Martin <gmsoft@gentoo.org> gtk+-1.2.10-r10.ebuild :
-  Marked stable on hpp.
-
-  04 Apr 2003; Jason Wever <weeve@gentoo.org> gtk+-1.2.10-r10.ebuild:
-  Changed ~sparc keyword to sparc.
-
-  30 Mar 2003; Aron Griffis <agriffis@gentoo.org> gtk+-1.2.10-r10.ebuild:
-  Mark stable on alpha
-
-  16 Mar 2003; Mark Guertin <gerk@gentoo.org> gtk+-1.2.10-r10.ebuild:
-  set ppc in keywords
-
-  16 Mar 2003; Guy Martin <gmsoft@gentoo.org> gtk+-1.2.10-r10.ebuild :
-  Added ~hppa to keywords.
-
-  09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gtk+-1.2.10-r10.ebuild :
-  Change to fully use epatch, and also make use of libtool eclass.
-
-  08 Mar 2003; foser <foser@gentoo.org> gtk+-1.2.10-r10.ebuild :
-  New patch to fix locale problems that have been bugging us for a long time
-  Patch done by Stanislav Brabec <sbrabec@suse.cz> 
-  Related gentoo bugs #10529, #16883
-
-*gtk+-2.2.1 (04 Feb 2003)
-
-  01 Jul 2003; Guy Martin <gmsoft@gentoo.org> gtk+-2.2.1.ebuild :
-  Added hppa to KEYWORDS.
-
-  04 Mar 2003; Jason Wever <weeve@gentoo.org> gtk+-2.2.1.ebuild:
-  Added sparc to keywords.
-
-  01 Mar 2003; Jason Wever <weeve@gentoo.org> gtk+-2.2.1.ebuild:
-  Added ~sparc to keywords.
-
-  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> gtk+-2.2.1.ebuild :
-  Mark stable on alpha
-
-  13 Feb 2003; Jon Nall <nall@gentoo.org> gtk+-2.2.1.ebuild :
-  bumped pango version to 1.1.3 since the gtk+ configure script
-  barfs if xft-2 is installed, but pango <1.1.3 is installed
-
-  07 Feb 2003; foser <foser@gentoo.org> gtk+-2.2.1.ebuild :
-  Added alpha blended disabled icons patch
-
-  05 Feb 2003; Jon Nall <nall@gentoo.org> gtk+--2.2.1.ebuild :
-  added patch to fix endian problem for 15/24 bit displays
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+-2.2.1.ebuild :
-  bumped version
-
-  16 Jan 2003; foser <foser@gentoo.org> gtk+-2.2.0.ebuild :
-  Added some info about rebuilding gtk theme engines after an emerge
-
-  04 Jan 2003; Rodney Rees <manson@gentoo.org> gtk+-2.0.6-r3.ebuild :
-  changed ~sparc to sparc
-
-  01 Jan 2003; Aron Griffis <agriffis@gentoo.org> gtk+-2.0.9.ebuild gtk+-2.2.0.ebuild:
-  Reverted previous change on gtk+-2.0.9 since it sounds like 2.2.0 works on
-  Alpha.  Added ~alpha to KEYWORDS on 2.2.0
-
-  31 Dec 2002; Aron Griffis <agriffis@gentoo.org> gtk+-2.0.9.ebuild :
-  glib-2.0.7 is broken on alpha, so change the dependency here to version
-  2.0.6 which works fine with gtk+-2.0.9
-
-  24 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gtk+-2.2.0.ebuild :
-  Fix to depend on glib-2.2.0, else it fails with unresolved symbols ..
-
-*gtk+-2.2.0 (22 Dec 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-
-  22 Dec 2002; foser <foser@gentoo.org> gtk+-2.2.0.ebuild :
-  New version
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  21 Nov 2002; Martin Schlemmer <azarah@gentoo.org> gtk+-2.1.2.ebuild,
-  gtk+-2.0.9.ebuild :
-
-  Turn of --export-symbols-regex for now, since it removes
-  the wrong symbols.  Patch from Redhat.
-
-*gtk+-2.0.9 (20 Nov 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  20 Nov 2002; foser <foser@gentoo.org> gtk+-2.0.9.ebuild :
-  New version, mainly fixes a bug which made metacity crash
-
-*gtk-2.0.8-r1 (15 Nov 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  15 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.8-r1.ebuild
-  files/digest-gtk+-2.0.8-r1 :
-
-  DirectFB patched version of it.
-
-*gtk+-2.1.2 (12 Nov 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  29 Nov 2002; Jon Nall <nall@gentoo.org> gtk+-2.1.2.ebuild :
-  added ~ppc to KEYWORDS
-
-  12 Nov 2002; foser <foser@gentoo.org> gtk+-2.1.2.ebuild :
-  GNOME 2.1.2 release
-
-*gtk+-2.0.8 (09 Nov 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  12 Nov 2002; L. Boshell <leonardop@gentoo.org> : Removed directfb dep
-  since it wasn't being used.
-
-  11 Nov 2002; Spider <spider@gentoo.org> gtk+-2.0.8.ebuild :
-  stabilized for x86
-  
-  09 Nov 2002; Spider <spider@gentoo.org> gtk+-2.0.8.ebuild 
-  files/digest-gtk+-2.0.8 : New version fixes the patch needed for last version
-  also fixed the dependencies, after 2.0.7-r1.
-  
-*gtk+-2.0.7-r1 (05 Nov 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  09 Nov 2002; foser <foser@gentoo.org> gtk+-2.0.7-r1 :
-  Added sgmltools-lite dep, to fix documentation problems
-
-  05 Nov 2002; foser <foser@gentoo.org> gtk+-2.0.7-r1 :
-  Added a patch to fix problems with gdk-pixbuf (bug #10261)
-
-*gtk+-2.0.7 (04 Nov 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  04  Nov 2002; Spider <spider@gentoo.org> gtk+-2.0.4.ebuild 
-  files/digest-gtk+-2.0.4: added the latest stable release, bugfixes and nothing
-  more. Ripped out the directfb (wow, it survived more than 10 days! )
-
-  
-*gtk+-2.1.1 (27 Oct 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  27 Oct 2002; foser <foser@gentoo.org> gtk+-2.1.1.ebuild :
-  gnome 2.1
-
-*gtk+-2.0.6-r3 (21 Oct 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  21 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.6-r3.ebuild
-  files/digest-gtk+-2.0.6-r3 :
-
-  Added the DirectFB patch (finally!)
-
-*gtk+-2.0.6-r2 (10 Oct 2002)
-  
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  10 Oct 2002; foser <foser@gentoo.org> gtk+-2.0.6-r2.ebuild :
-  Bumped revision to get the safety replacement added in r1 spread  
-
-*gtk+-1.2.10-r9 (26 Sep 2002)
- 
-  16 Mar 2003; Guy Martin <gmsoft@gentoo.org> gtk+-1.2.10-r9.ebuild :
-  Added hppa to keywords.
- 
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  26 Sep 2002; Spider <spider@gentoo.org> gtk+-1.2.10-r9.ebuild :
-  This build enables minimal debugging for all users, this will fix some unexpected crashes in amongst other things xchat.
-
-*gtk+-2.0.6-r1 (04 Jul 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  08 Oct 2002; foser <foser@gentoo.org> gtk+-2.0.6-r1.ebuild :
-  Replace -O3 with -O2 to be on the safe side (bug 8762)
-
-  04 Jul 2002; Spider <spider@gentoo.org> gtk+-2.0.6-r1.ebuild :
-  remove unnecessary debugging
-  remove bad parts from SRC_URI  (broken use)
-  changed configure some
-
-*gtk+-2.0.6 (04 Jul 2002)
-
-  04 Feb 2003; Spider <spider@gentoo.org> gtk+*.ebuild:
-  changed all DEBUG to DEBUGBUILD
-
-  04 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> gtk+-2.0.6.ebuild:
-
-  New version.
-
-*gtk+-2.0.5-r2 (15 Jul 2002)
-
-  15 Jul 2002; Owen Stampflee <owen@gentoo.org> :
-
-  Added PPC to KEYWORDS.
-
-  15 Jul 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.5-r2.ebuild
-  files/digest-gtk+-2.0.5-r2 :
-
-  directfb enabled GTK is now a patch on our mirrors instead of being a
-  separate tarball.  This makes the behaviour better for portage's server
-  side caching.
-
-*gtk+-2.0.5-r1 (03 Jul 2002)
-
-  03 Jul 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.5-r1.ebuild
-  files/digest-gtk+-2.0.5-r1 :
-
-  The DirectFB tarball was replaced on the directfb.org server with one that
-  has bugfixes in it.  No need for paranoia, the directfb folks have
-  verified it for us.  Thanks to: gentoo@tuurlijk.eu.org (Tuurlijk!) in bug
-  #4451 for spotting it.
-
-*gtk+-2.0.5 (17 Jun 2002)
-
-  17 Jun 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.5.ebuild
-  files/digest-gtk+-2.0.5 :
-
-  Version bump for both regular GTK+2 and GTK+DirectFB
-
-*gtk+-2.0.3-r1 (8 Jun 2002)
-
-  8 Jun 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-2.0.3-r1.ebuild
-  files/digest-gtk+-2.0.3-r1 :
-
-  Option for directfb-patched gtk libs.  This actually gets and compiles a
-  separate source tarball from directfb.org
-
-*gtk+-2.0.3 (28 May 2002)                                                    
-  28 May 2002; Spider <spider@gentoo.org> gtk+-2.0.3.ebuild:
-  new stable branch  
-
-*gtk+-1.2.10-r8 (27 May 2002)
-
-  27 May 2002; Bruce A. Locke <blocke@shivan.org> gtk+-1.2.10-r8.ebuild:
-
-  Ximian patch set and redhat/mdk patch merged
-
-*gtk+-2.0.2-r6 (27 May 2002)                                                    
-  27 May 2002; Spider <spider@gentoo.org> gtk+-2.0.2-r6.ebuild:
-  fix for the use png bug, not libtoolized  
-
-*gtk+-2.0.2-r5 (23 May 2002)                                                    
-  23 May 2002; Spider <spider@gentoo.org> gtk+-2.0.2-r5.ebuild:
-  seems people who installed with the libtoolized version of gtk+ fails
-  when installing gtk+ again.  Test this version if it works (read
-libtoolize)
-	
-
-*gtk+-2.0.2-r4 (22 May 2002)                                                    
-  22 May 2002; Spider <spider@gentoo.org> gtk+-2.0.2-r4.ebuild:
-
-  lintool check
-  debug info back inside
-  remove libtoolize since it breaks things
-  singlethread make since this uses cludgy code 
-
-
-gtk+-1.2.10-r7 (14 Apr 2002)
-  14 Apr 2002; M.Schlemmer <azarah@gentoo.org>; gtk+-1.2.10-r7.ebuild :
-  Libtoolize.
-
-*gtk+-2.0.2-r2 (24 Apr 2002) 
-  24 Apr 2002; Spider <spider@gentoo.org>; gtk+-2.0.2-r2.ebuild:
-  Libtoolize 
-
-*gtk+-2.0.2-r2 (12 Apr 2002)
-  12 Apr 2002; Spider <spider@gentoo.org>; gtk+-2.0.2-r2.ebuild: 
-  Update so a user can disable png, jpeg, tiff support for gtk+
-  This will so break things if they disable it though ;)
-
-
-gtk+-2.0.2-r1
-  11 Apr 2002; Spider <spider@gentoo.org>; gtk+-1.2.10-r4.ebuild gtk+-1.2.10-r5.ebuild gtk+-1.2.10-r6.ebuild gtk+-1.2.10-r7.ebuild gtk+-2.0.2-r1.ebuild :
-  Update all glib dependencies to use glib-1.2*  in preparation of
-unmasking the glib-2.0.1 packages
-
-
-*gtk+-2.0.2 (11 Apr 2002)
-  11 Apr 2002; Spider <spider@gentoo.org>; gtk+-2.0.2-r1.ebuild:
-  New release with new api
-  USE="doc" will build api documentation
-  needs libpng 1.2.1 and is masked because of that.
-  needs glib 2.0 as well
-
-
-*gtk+-1.2.10-r7 (23 Mar 2002)
-
-  23 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-1.2.10-r7.ebuild :
-
-  Man pages are now in LFH compliant /usr/share/man tree.  Changes submitted by
-  Matthew Kennedy.
-
-*gtk+-1.2.10-r6 (21 Mar 2002)
-
-  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gtk+-1.2.10-r6.ebuild :
-
-  Changed the html documentation step to not be gzipped.  This is a small
-  enough change that it shouldn't matter to have users remerge it.
-
-*gtk+-1.2.10-r6 (13 Mar 2002)
-
-  13 Mar 2002; Bruce A. Locke <blocke@shivan.org> gtk+-1.2.10-r6.ebuild :
-
-  gtk+ 1.2.10-r6 now includes patches from Ximian Gnome that help make
-  the gtk+ file picker dialog a little more user friendly :)
-  
-*gtk+-1.2.10-r5 (10 Mar 2002)
-
-  10 Mar 2002; Bruce A. Locke <blocke@shivan.org> gtk+-1.2.10-r5.ebuild :
-
-  NLS fixes submitted by seemant@rocketmail.com (Seemant Kulleen)
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/Manifest
deleted file mode 100644
index 427e361905..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtk+-2.20.1.tar.bz2 19089076 SHA256 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65 SHA512 1cef8b36ecdab8f1b3b9b6c951b64d85e852a666110e881833513d3ff34730a743b882a0a5aa9fe7d3ea62de7de910aa9c4e08d5ea5558b151410fc1536599d9 WHIRLPOOL b7f7ffb2a120ba372ca2e2e66a0f3cc9064d41e721818ff2cce11fb8956040ccbbf19e4c38682ada6e7211b7d1bb86f8d7086df353d2c59dd6585c535eab6059
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
deleted file mode 100644
index 3fe8cffd90..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugzilla.gnome.org/show_bug.cgi?id=536767
-
-Makes inkscape and claws-mail buildable again. Basically all packages still using
-GtkCList and single included headers.
---- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
-+++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
-@@ -29,7 +29,9 @@
- #ifndef __GTK_SIGNAL_H__
- #define __GTK_SIGNAL_H__
- 
--#include <gtk/gtk.h>
-+#include <gtk/gtkenums.h>
-+#include <gtk/gtktypeutils.h>
-+#include <gtk/gtkobject.h>
- #include <gtk/gtkmarshal.h>
- 
- G_BEGIN_DECLS
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch
deleted file mode 100644
index f13ffe65c5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-This patch touches both the Makefile.am files as well as the Makefile.in files because
-eautoreconf doesn't work properly on gtk+, for some reason.
-
---- gtk+-2.18.5.orig/demos/gtk-demo/Makefile.am
-+++ gtk+-2.18.5/demos/gtk-demo/Makefile.am
-@@ -83,6 +83,10 @@ gtk_demo_DEPENDENCIES = $(DEPS)
- gtk_demo_LDADD = $(LDADDS)
- gtk_demo_LDFLAGS = -export-dynamic
- 
-+if USE_QUARTZ
-+gtk_demo_LDFLAGS += -framework AppKit -framework Carbon
-+endif
-+
- IMAGEFILES=	alphatest.png		\
- 	        apple-red.png		\
- 		background.jpg		\
---- gtk+-2.18.5.orig/demos/gtk-demo/Makefile.in
-+++ gtk+-2.18.5/demos/gtk-demo/Makefile.in
-@@ -40,6 +40,7 @@ host_triplet = @host@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/geninclude.pl.in $(top_srcdir)/Makefile.decl
- bin_PROGRAMS = gtk-demo$(EXEEXT)
-+@USE_QUARTZ_TRUE@am__append_1 = -framework AppKit -framework Carbon
- subdir = demos/gtk-demo
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-@@ -460,7 +461,7 @@ gtk_demo_SOURCES = \
- 
- gtk_demo_DEPENDENCIES = $(DEPS)
- gtk_demo_LDADD = $(LDADDS)
--gtk_demo_LDFLAGS = -export-dynamic
-+gtk_demo_LDFLAGS = -export-dynamic $(am__append_1)
- IMAGEFILES = alphatest.png		\
- 	        apple-red.png		\
- 		background.jpg		\
---- gtk+-2.18.5.orig/demos/Makefile.am
-+++ gtk+-2.18.5/demos/Makefile.am
-@@ -28,6 +28,10 @@ noinst_PROGRAMS = 		\
- 	testpixbuf-scale 	\
- 	pixbuf-demo
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- # Need to build test-inline-pixbufs.h for testpixbuf
- if HAVE_PNG
- noinst_PROGRAMS += testpixbuf
---- gtk+-2.18.5.orig/demos/Makefile.in
-+++ gtk+-2.18.5/demos/Makefile.in
-@@ -433,6 +433,7 @@ LDADDS = \
- 	$(top_builddir)/gdk/$(gdktargetlib)        			\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- @HAVE_PNG_TRUE@BUILT_SOURCES = test-inline-pixbufs.h
- @CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
- @CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE)
---- gtk+-2.18.5.orig/gtk/Makefile.am
-+++ gtk+-2.18.5/gtk/Makefile.am
-@@ -888,7 +888,7 @@ libgtk_directfb_2_0_la_SOURCES = $(gtk_c
- 
- libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
- libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
--libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon
- libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
- 
- libgtk_x11_2_0_la_LIBADD = $(libadd)
-@@ -901,6 +901,10 @@ libgtk_win32_2_0_la_DEPENDENCIES = $(gtk
- libgtk_quartz_2_0_la_DEPENDENCIES = $(deps)
- libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- if USE_WIN32
- libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
- endif
---- gtk+-2.18.5.orig/gtk/Makefile.in
-+++ gtk+-2.18.5/gtk/Makefile.in
-@@ -1294,7 +1294,7 @@ libgtk_quartz_2_0_la_SOURCES = $(gtk_c_s
- libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
- libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
- libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
--libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon
- libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
- libgtk_x11_2_0_la_LIBADD = $(libadd)
- libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-@@ -1304,6 +1304,7 @@ libgtk_x11_2_0_la_DEPENDENCIES = $(deps)
- libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
- libgtk_quartz_2_0_la_DEPENDENCIES = $(deps)
- libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- @USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
- EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
- DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
---- gtk+-2.18.5.orig/perf/Makefile.am
-+++ gtk+-2.18.5/perf/Makefile.am
-@@ -20,6 +20,10 @@ LDADDS =								\
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- noinst_PROGRAMS	= 	\
- 	testperf
- 
---- gtk+-2.18.5.orig/perf/Makefile.in
-+++ gtk+-2.18.5/perf/Makefile.in
-@@ -373,6 +373,7 @@ LDADDS = \
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- testperf_DEPENDENCIES = $(TEST_DEPS)
- testperf_LDADD = $(LDADDS)
- testperf_SOURCES = \
---- gtk+-2.18.5.orig/tests/Makefile.am
-+++ gtk+-2.18.5/tests/Makefile.am
-@@ -20,6 +20,10 @@ LDADDS =								\
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- if USE_X11
- testsocket_programs = testsocket testsocket_child
- endif
---- gtk+-2.18.5.orig/tests/Makefile.in
-+++ gtk+-2.18.5/tests/Makefile.in
-@@ -639,6 +639,7 @@ LDADDS = \
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- @USE_X11_TRUE@testsocket_programs = testsocket testsocket_child
- @HAVE_CXX_TRUE@autotestkeywords_SOURCES = autotestkeywords.cc
- @HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers \
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.7-gold.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.7-gold.patch
deleted file mode 100644
index e412c40f32..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.7-gold.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/gtk+-2.18.7/configure b/gtk+-2.18.7/configure
-index 53755ea..17e7082 100755
---- a/gtk+-2.18.7/configure
-+++ b/gtk+-2.18.7/configure
-@@ -10338,6 +10338,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtkrc b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtkrc
deleted file mode 100644
index 8d1783431d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtkrc
+++ /dev/null
@@ -1,39 +0,0 @@
-style "default"
-
-{
- font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*"
-}
-
-style "button" = "default"
-
-{ 
- bg[PRELIGHT] = { 0.7, 0.7, 0.9 }
-}
-
-style "treeitem"
-{
-bg[ACTIVE] = { 0.7, 0.7, 0.9 }
-}
-
-style "scrollbar" = "button" 
-{
- bg[ACTIVE] = {0.6, 0.6, 0.6 }
-}
-
-style "status" {
- bg[PRELIGHT] = { 0.3, 1.0, 0.3 }
-}
-
-style "gtk-tooltips" {
- bg[NORMAL] = "#ffff60"
-}
-
-class "GtkWidget" style "default" 
-class "GtkButton" style "button"
-class "GtkItem" style "button"
-class "GtkProgressBar" style "status"
-class "GtkScrollbar" style "scrollbar"
-class "GtkTreeItem" style "treeitem"
-widget "gtk-tooltips" style "gtk-tooltips"
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/gtk+-2.20.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/gtk+-2.20.1.ebuild
deleted file mode 100644
index 8badde670a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/gtk+-2.20.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/Attic/gtk+-2.18.7-r1.ebuild,v 1.1 2010/03/11 14:52:23 pacho Exp $
-
-EAPI="2"
-
-inherit gnome.org flag-o-matic eutils libtool virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama"
-
-# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-RDEPEND="!aqua? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXt
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.2
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		>=x11-libs/cairo-1.6[X,svg]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.6[aqua,svg]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.21.3
-	>=x11-libs/pango-1.20
-	>=dev-libs/atk-1.13
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	cups? ( net-print/cups )
-	jpeg? ( >=media-libs/jpeg-6b-r2:0 )
-	jpeg2k? ( media-libs/jasper )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	!<gnome-base/gail-1000"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-	)
-	x86-interix? (
-		sys-libs/itx-bind
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-pkg_setup() {
-	use prefix || EPREFIX=
-}
-
-src_prepare() {
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
-
-	# Don't break inclusion of gtkclist.h, upstream bug 536767
-	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
-
-	# add correct framework linking options, for aqua
-	epatch "${FILESDIR}/${PN}-2.18.5-macosx-aqua.patch"
-
-	# Fix version script not used when gold linker turned on
-	epatch "${FILESDIR}/${PN}-2.18.7-gold.patch"
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-
-	elibtoolize
-}
-
-src_configure() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc) \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with tiff libtiff) \
-		$(use_enable xinerama) \
-		$(use_enable cups cups auto) \
-		--disable-papi \
-		--with-libpng"
-	if use aqua; then
-		myconf="${myconf} --with-gdktarget=quartz"
-	else
-		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
-	fi
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto ${GTK2_CONFDIR}
-	doins "${T}"/gtkrc
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
-	doenvd "${T}"/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	# This has to be removed, because it's multilib specific; generated in
-	# postinst
-	rm "${D%/}${EPREFIX}/etc/gtk-2.0/gtk.immodules"
-
-	# ChromeOS specific: Remove all gtk im modules except im-ibus.* since
-	# we don't use them. (crosbus.com/11580)
-	for immodule in "${D%/}${EPREFIX}/usr/lib/gtk-2.0/2.*/immodules/*"
-	do
-	    grep ibus $immodule || rm $immodule
-	done
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${D%/}${EPREFIX}"/usr/lib/pkgconfig/$i || die "sed failed"
-	done
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	if [ -d "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-		gdk-pixbuf-query-loaders > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-	else
-		ewarn "The destination path ${ROOT%/}${EPREFIX}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${ROOT%/}${EPREFIX}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
-	fi
-
-	if [ -e "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	elog "Please install app-text/evince for print preview functionality."
-	elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-	elog "add it to your gtkrc."
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/metadata.xml b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/metadata.xml
deleted file mode 100644
index 2662444a43..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>gnome</herd>
-  <longdescription>
-    GTK+ is a multi-platform toolkit for creating graphical user
-    interfaces. Offering a complete set of widgets, GTK+ is suitable
-    for projects ranging from small one-off projects to complete
-    application suites.
-  </longdescription>
-</pkgmetadata>
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/Manifest
deleted file mode 100644
index 54681700df..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXfont-1.4.4.tar.bz2 440022 RMD160 0241b2505ed65b0bd66d8bd3c80330a4db6eea6d SHA1 189dd7a3756cb80bcf41b779bf05ec3c366e3041 SHA256 a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/libXfont-1.4.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/libXfont-1.4.4-r1.ebuild
deleted file mode 100644
index 2080e5185d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/libXfont-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.4.ebuild,v 1.7 2011/08/15 15:24:56 armin76 Exp $
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/xtrans
-	x11-libs/libfontenc
-	>=media-libs/freetype-2
-	app-arch/bzip2
-	x11-proto/xproto
-	x11-proto/fontsproto"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc devel-docs)
-		$(use_with doc xmlto)
-		--without-bzip2
-		--disable-freetype
-		--without-fop
-		--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
-	)
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/Manifest
deleted file mode 100644
index 5ef8fa2fab..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXft-2.2.0.tar.bz2 290451 RMD160 e2955cfd5c8d2e02d4dba5f01b5132634005f971 SHA1 ed29784259f4e26df78141035560ae8a7c62e83f SHA256 c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/libXft-2.2.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/libXft-2.2.0-r1.ebuild
deleted file mode 100644
index 6e4ff78986..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/libXft-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.2.0.ebuild,v 1.10 2011/02/14 23:22:40 xarthisius Exp $
-
-EAPI=3
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="X.Org Xft library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrender-0.8.2
-	x11-libs/libX11
-	x11-libs/libXext
-	media-libs/freetype
-	media-libs/fontconfig
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/Manifest
deleted file mode 100644
index ea6a9ccd0a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXi-1.6.0.tar.bz2 418674 SHA256 b2fc65a24a269405c5bbe27152e97ed4c5987ca728b9d7e7576e4c9543c4a7af SHA512 b583b72451ac1f7524f694975feacc1c5071912de9f7e5d825bef8f4c448064bc18d7ed856f4480be190bbe90ac74bdc61606872cd6c4cd72460688a144417ed WHIRLPOOL 57bee6553117632d3ea757a2678b83f17eda10e1469c520b0c3136e9b03c52243275fa48da00e9c90e6428a9e5d51c03331d0deea792042479473aeaf949f4fd
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/files/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/files/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch
deleted file mode 100644
index 0a66652398..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/files/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8436c920953f288aea2d6d5f370f8eaaaef82d97 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 15 Mar 2012 11:51:41 +1000
-Subject: [PATCH] Fix wrong button label and mask copy on OS X
-
-Regression introduced in c1a5a70b51f12dedf354102217c7cd4247ed3a4b.
-
-If double-padding is applied, the length of the mask on the wire may be
-smaller than libXi's mask_len. When copying, only the wire length must be
-copied, with the remainder set to 0.
-When advancing to the button labels, the wire length matters, not libXi's
-internal length.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
----
- src/XExtInt.c |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/XExtInt.c b/src/XExtInt.c
-index 89c0894..0c64f9a 100644
---- a/src/XExtInt.c
-+++ b/src/XExtInt.c
-@@ -1610,12 +1610,14 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses)
-                     int struct_size;
-                     int state_size;
-                     int labels_size;
-+                    int wire_mask_size;
- 
-                     cls_wire = (xXIButtonInfo*)any_wire;
-                     sizeXIButtonClassType(cls_wire->num_buttons,
-                                           &struct_size, &state_size,
-                                           &labels_size);
-                     cls_lib = next_block(&ptr_lib, struct_size);
-+                    wire_mask_size = ((cls_wire->num_buttons + 7)/8 + 3)/4 * 4;
- 
-                     cls_lib->type = cls_wire->type;
-                     cls_lib->sourceid = cls_wire->sourceid;
-@@ -1623,10 +1625,14 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses)
-                     cls_lib->state.mask_len = state_size;
-                     cls_lib->state.mask = next_block(&ptr_lib, state_size);
-                     memcpy(cls_lib->state.mask, &cls_wire[1],
--                           cls_lib->state.mask_len);
-+                           wire_mask_size);
-+                    if (state_size != wire_mask_size)
-+                        memset(&cls_lib->state.mask[wire_mask_size], 0,
-+                               state_size - wire_mask_size);
- 
-                     cls_lib->labels = next_block(&ptr_lib, labels_size);
--                    atoms =(uint32_t*)((char*)&cls_wire[1] + cls_lib->state.mask_len);
-+
-+                    atoms =(uint32_t*)((char*)&cls_wire[1] + wire_mask_size);
-                     for (j = 0; j < cls_lib->num_buttons; j++)
-                         cls_lib->labels[j] = *atoms++;
- 
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/libXi-1.6.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/libXi-1.6.0-r1.ebuild
deleted file mode 100644
index 837b74daf7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/libXi-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.6.0.ebuild,v 1.1 2012/03/09 00:04:22 chithanh Exp $
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.4.99.1
-	>=x11-libs/libXext-1.1
-	>=x11-proto/inputproto-2.1.99.6
-	>=x11-proto/xproto-7.0.13
-	>=x11-proto/xextproto-7.0.3"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch"
-)
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		$(use_with doc asciidoc)
-		--without-fop
-	)
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-
-	ewarn "Some special keys and keyboard layouts may stop working."
-	ewarn "To fix them, recompile xorg-server."
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/Manifest
deleted file mode 100644
index 5d76ac477d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXt-1.0.6.tar.bz2 538143 SHA256 8d940251972ffe7e3caa41c4e82b6659ad4070aa2ec0d3e789c9fa39b79ff947 SHA512 eaea416961342e8f2cf54a9545050a3ecf3d23b283f181e61ce944547e9fa8257171bbc338c5cc4e208e4856cf596293406893b27b8f47825f728d5201e8a550 WHIRLPOOL 29959c4a79986efc4dabe16672ef2b306111e80ce13726d689d35af1445fbbd41fa84b7b49c1f512932e6de54eb4a41eb9b3015bce0105c6e9d398a636364e88
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/files/libXt-1.0.6-cross.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/files/libXt-1.0.6-cross.patch
deleted file mode 100644
index b5448ccbbd..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/files/libXt-1.0.6-cross.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f77482f0618f954de1d080599ada058e9a3c24ff Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 28 Jul 2009 09:59:41 +0000
-Subject: Fix compilation of host tools in cross-compilation case
-
-At 36e9f0d351afbf7fd2595990b2d39e7c551f6420, a fix was added to use
-the host gcc instead of the target gcc when cross-compiling
-libXt. This fix works, but is not solve the whole problem: the CFLAGS
-and LDFLAGS used with the host compilers are the one defined for the
-target compiler (and the flags for both compilers might be very
-different).
-
-This new fix let libXt obey to CFLAGS_FOR_BUILD and LDFLAGS_FOR_BUILD
-environment variables, and use them to compile the host tools in
-util/.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
-diff --git a/configure.ac b/configure.ac
-index 043ab5f..cb00a41 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,6 +48,10 @@ if test x"$CC_FOR_BUILD" = x; then
- 	fi
- fi
- AC_SUBST([CC_FOR_BUILD])
-+CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-+AC_SUBST(CFLAGS_FOR_BUILD)
-+LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
-+AC_SUBST(LDFLAGS_FOR_BUILD)
- 
- PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)
- 
-diff --git a/util/Makefile.am b/util/Makefile.am
-index 0d3ff01..37b78d2 100644
---- a/util/Makefile.am
-+++ b/util/Makefile.am
-@@ -5,6 +5,8 @@ noinst_PROGRAMS = makestrs
- endif
- 
- CC = @CC_FOR_BUILD@
-+CFLAGS = @CFLAGS_FOR_BUILD@
-+LDFLAGS = @LDFLAGS_FOR_BUILD@
- 
- EXTRA_DIST = \
- 	Shell.ht \
---
-cgit v0.8.2
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/libXt-1.0.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/libXt-1.0.6-r1.ebuild
deleted file mode 100644
index 4c136f8450..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/libXt-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.6.ebuild,v 1.6 2009/10/11 11:04:55 nixnut Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xt library"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-proto/xproto
-	x11-proto/kbproto"
-DEPEND="${RDEPEND}"
-
-# patch is in git master and macros are only needed if SNAPSHOT is set to "yes"
-DEPEND="${DEPEND} >=x11-misc/util-macros-1.2"
-PATCHES=("${FILESDIR}/libXt-1.0.6-cross.patch")
-
-pkg_setup() {
-	# No such function yet
-	# x-modular_pkg_setup
-
-	# (#125465) Broken with Bdirect support
-	filter-flags -Wl,-Bdirect
-	filter-ldflags -Bdirect
-	filter-ldflags -Wl,-Bdirect
-}
-
-# msb: Copied from http://gentoo.mindzoo.de/index.cgi/changeset/151
-# Reference: http://gentoo.mindzoo.de/index.cgi/ticket/3
-x-modular_src_compile() {
-	x-modular_src_configure
-
-	# For some reason, CC gets cleared out after the x-modular_src_make
-	# call so the recompile below would fail, so we save off the target CC.
-	TARGET_CC=$(tc-getCC)
-
-	# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for makestr
-	( filter-flags -m* ;
-	  cd util &&
-	    make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS= clean all )
-	x-modular_src_make
-
-	# [Cross-Compile Love] Recompile 'makestr' with the target compiler,
-	# just in case we want to install it.
-	( cd util && make CC="${TARGET_CC}" clean all )
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/Manifest
deleted file mode 100644
index 52bf23f710..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libdrm-2.4.39.tar.bz2 492215 SHA256 386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d SHA512 51b849d501adbf6c9d65847d2e6b41e426137af8cdb1335d19e22939128b7cdae8685c27d750db3aad7b1c43e7bb5a448634491dcd86873ba98293d56320eb1f WHIRLPOOL 9b23f950126cff75871610d46da70aa3b2dfed90f2271a2d547f5f3c2951ca41e35478ca4f11d6ad08327969836f8aede8e34cb9069b584472b7a9f67a2358c8
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39-r2.ebuild
deleted file mode 120000
index 119496a4a7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39-r2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-libdrm-tests-2.4.39.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39.ebuild
deleted file mode 100644
index 3158c681c4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.34.ebuild,v 1.1 2012/05/11 00:25:45 chithanh Exp $
-
-EAPI=4
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-
-UPSTREAM_PKG="${P/-tests}"
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://dri.freedesktop.org/${PN}/${UPSTREAM_PKG}.tar.bz2"
-fi
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-VIDEO_CARDS="exynos intel nouveau omap radeon vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms"
-RESTRICT="test" # see bug #236845
-
-RDEPEND="dev-libs/libpthread-stubs
-	sys-fs/udev
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )
-	~x11-libs/libdrm-${PV}"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${UPSTREAM_PKG}
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		--enable-udev
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_vmware vmwgfx-experimental-api)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable libkms)
-	)
-
-	xorg-2_pkg_setup
-}
-
-src_compile() {
-	xorg-2_src_compile
-
-	# Manually build tests since they are not built automatically.
-	# This should match the logic of tests/Makefile.am.  e.g. gem tests for
-	# intel only.
-	TESTS=( dr{i,m}stat )
-	if use video_cards_intel; then
-		TESTS+=( gem_{basic,flink,readwrite,mmap} )
-	fi
-	emake -C "${AUTOTOOLS_BUILD_DIR}"/tests "${TESTS[@]}"
-}
-
-src_install() {
-	into /usr/local/
-	dobin "${AUTOTOOLS_BUILD_DIR}"/tests/*/.libs/*
-	dobin "${TESTS[@]/#/${AUTOTOOLS_BUILD_DIR}/tests/.libs/}"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/Manifest
deleted file mode 100644
index 52bf23f710..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libdrm-2.4.39.tar.bz2 492215 SHA256 386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d SHA512 51b849d501adbf6c9d65847d2e6b41e426137af8cdb1335d19e22939128b7cdae8685c27d750db3aad7b1c43e7bb5a448634491dcd86873ba98293d56320eb1f WHIRLPOOL 9b23f950126cff75871610d46da70aa3b2dfed90f2271a2d547f5f3c2951ca41e35478ca4f11d6ad08327969836f8aede8e34cb9069b584472b7a9f67a2358c8
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39-r5.ebuild
deleted file mode 120000
index f6ec90f982..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39-r5.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-libdrm-2.4.39.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39.ebuild
deleted file mode 100644
index e0c9c85953..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.34.ebuild,v 1.1 2012/05/11 00:25:45 chithanh Exp $
-
-EAPI=4
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-VIDEO_CARDS="exynos intel nouveau omap radeon vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms"
-RESTRICT="test" # see bug #236845
-
-RDEPEND="dev-libs/libpthread-stubs
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		--enable-udev
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_vmware vmwgfx-experimental-api)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable libkms)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/Manifest
deleted file mode 100644
index 051266c7ad..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libpciaccess-0.12.902.tar.bz2 331008 SHA256 0861d5bf68b598baa307e5c9b06dfd38ae03096b46e36b236106517bcd14b63a SHA512 8c5f7d204a742e97826558705559d4c3f41d6e3a0b2a711136e98ba181ccf7605c35ee216c41c0298d90100808e358b67103e1c51c688947269648a13c53528b WHIRLPOOL a62e8f9a8655396d5ea9cce8f9b83d8819beabe51f6d21dd3c5314c8a6d153d802fe3ca323a303f82f065a1c2011259fecc4a5ed1cb2e41006bf55c97a91f3e6
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/files/nodevport.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/files/nodevport.patch
deleted file mode 100644
index 6de2b5f7aa..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/files/nodevport.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From f550c1347d3518874fe1c1d417a57322ee6b52db Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 27 Feb 2012 15:43:20 +0000
-Subject: linux: Don't use /dev/port
-
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
-index 09e7138..9566d40 100644
---- a/src/linux_sysfs.c
-+++ b/src/linux_sysfs.c
-@@ -1,6 +1,7 @@
- /*
-  * (C) Copyright IBM Corporation 2006
-  * All Rights Reserved.
-+ * Copyright 2012 Red Hat, Inc.
-  *
-  * Permission is hereby granted, free of charge, to any person obtaining a
-  * copy of this software and associated documentation files (the "Software"),
-@@ -44,6 +45,18 @@
- #include <dirent.h>
- #include <errno.h>
- 
-+#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
-+#include <sys/io.h>
-+#else
-+#define inb(x) -1
-+#define inw(x) -1
-+#define inl(x) -1
-+#define outb(x) do {} while (0)
-+#define outw(x) do {} while (0)
-+#define outl(x) do {} while (0)
-+#define iopl(x) -1
-+#endif
-+
- #include "config.h"
- 
- #ifdef HAVE_MTRR
-@@ -769,12 +782,17 @@ pci_device_linux_sysfs_open_legacy_io(struct pci_io_handle *ret,
- 	dev = pci_device_get_parent_bridge(dev);
-     }
- 
--    /* If not, /dev/port is the best we can do */
--    if (!dev)
--	ret->fd = open("/dev/port", O_RDWR);
-+    /*
-+     * You would think you'd want to use /dev/port here.  Don't make that
-+     * mistake, /dev/port only does byte-wide i/o cycles which means it
-+     * doesn't work.  If you think this is stupid, well, you're right.
-+     */
- 
--    if (ret->fd < 0)
--	return NULL;
-+    /* If we've no other choice, iopl */
-+    if (ret->fd < 0) {
-+	if (iopl(3))
-+	    return NULL;
-+    }
- 
-     ret->base = base;
-     ret->size = size;
-@@ -786,7 +804,8 @@ static void
- pci_device_linux_sysfs_close_io(struct pci_device *dev,
- 				struct pci_io_handle *handle)
- {
--    close(handle->fd);
-+    if (handle->fd > -1)
-+	close(handle->fd);
- }
- 
- static uint32_t
-@@ -794,8 +813,11 @@ pci_device_linux_sysfs_read32(struct pci_io_handle *handle, uint32_t port)
- {
-     uint32_t ret;
- 
--    pread(handle->fd, &ret, 4, port + handle->base);
--
-+    if (handle->fd > -1)
-+	pread(handle->fd, &ret, 4, port + handle->base);
-+    else
-+	ret = inl(port + handle->base);
-+	
-     return ret;
- }
- 
-@@ -804,7 +826,10 @@ pci_device_linux_sysfs_read16(struct pci_io_handle *handle, uint32_t port)
- {
-     uint16_t ret;
- 
--    pread(handle->fd, &ret, 2, port + handle->base);
-+    if (handle->fd > -1)
-+	pread(handle->fd, &ret, 2, port + handle->base);
-+    else
-+	ret = inw(port + handle->base);
- 
-     return ret;
- }
-@@ -814,7 +839,10 @@ pci_device_linux_sysfs_read8(struct pci_io_handle *handle, uint32_t port)
- {
-     uint8_t ret;
- 
--    pread(handle->fd, &ret, 1, port + handle->base);
-+    if (handle->fd > -1)
-+	pread(handle->fd, &ret, 1, port + handle->base);
-+    else
-+	ret = inb(port + handle->base);
- 
-     return ret;
- }
-@@ -823,21 +851,30 @@ static void
- pci_device_linux_sysfs_write32(struct pci_io_handle *handle, uint32_t port,
- 			       uint32_t data)
- {
--    pwrite(handle->fd, &data, 4, port + handle->base);
-+    if (handle->fd > -1)
-+	pwrite(handle->fd, &data, 4, port + handle->base);
-+    else
-+	outl(data, port + handle->base);
- }
- 
- static void
- pci_device_linux_sysfs_write16(struct pci_io_handle *handle, uint32_t port,
- 			       uint16_t data)
- {
--    pwrite(handle->fd, &data, 2, port + handle->base);
-+    if (handle->fd > -1)
-+	pwrite(handle->fd, &data, 2, port + handle->base);
-+    else
-+	outw(data, port + handle->base);
- }
- 
- static void
- pci_device_linux_sysfs_write8(struct pci_io_handle *handle, uint32_t port,
- 			      uint8_t data)
- {
--    pwrite(handle->fd, &data, 1, port + handle->base);
-+    if (handle->fd > -1)
-+	pwrite(handle->fd, &data, 1, port + handle->base);
-+    else
-+	outb(data, port + handle->base);
- }
- 
- static int
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/libpciaccess-0.12.902-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/libpciaccess-0.12.902-r1.ebuild
deleted file mode 100644
index 799789e483..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/libpciaccess-0.12.902-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.12.902.ebuild,v 1.1 2011/12/19 01:39:15 chithanh Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="minimal zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/nodevport.patch" )
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		"$(use_with zlib)"
-		"--with-pciids-path=${EPREFIX}/usr/share/misc"
-	)
-}
-
-src_install() {
-	xorg-2_src_install
-	if ! use minimal; then
-		dodir /usr/bin || die
-		${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" --mode=install "$(type -P install)" -c "${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" "${ED}"/usr/bin || die
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/Manifest
deleted file mode 100644
index ae3641d603..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST intel-driver-1.0.19_pre2.tar.bz2 710803 SHA256 8c746643cb87995de1d6b60c5d29029cfd577c6a6c76362ad059409d26ff18a7 SHA512 18187e937fcbb6a55b20b76e14364f5674252690870bce27eeff0ad2acae1960119065fb2f26f1be1c45fc10ff71d26106e542a6e7baaaaded3a09db24098f07 WHIRLPOOL a4741c0c7d722f6ffee1cb1a0cc31376ee395c65167f6f559ad35adcfe1e7cec5eccf23f8c5c205c1272f9b55df18f19fff608619eda09154d0ad4c033cb1de4
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/no_explicit_sync_in_va_sync_surface.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/no_explicit_sync_in_va_sync_surface.patch
deleted file mode 100644
index 7d6ef99aad..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/no_explicit_sync_in_va_sync_surface.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
-index 588961f..a35dacf 100644
---- a/src/i965_drv_video.c
-+++ b/src/i965_drv_video.c
-@@ -1470,14 +1470,10 @@ VAStatus
- i965_SyncSurface(VADriverContextP ctx,
-                  VASurfaceID render_target)
- {
--    struct i965_driver_data *i965 = i965_driver_data(ctx); 
--    struct object_surface *obj_surface = SURFACE(render_target);
--
--    assert(obj_surface);
--
--    if(obj_surface->bo)
--        drm_intel_bo_wait_rendering(obj_surface->bo);
--
-+    /*
-+     * No need to sync explicitly, as the driver will properly sync this
-+     * surface before the next operation using it as its source begins.
-+     */
-     return VA_STATUS_SUCCESS;
- }
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/va_terminate.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/va_terminate.patch
deleted file mode 100644
index b8c8483a4a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/va_terminate.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
-index 3d85248..c888afd 100644
---- a/src/i965_drv_video.c
-+++ b/src/i965_drv_video.c
-@@ -2399,9 +2399,6 @@ i965_Terminate(VADriverContextP ctx)
-     if (i965_post_processing_terminate(ctx) == False)
-         return VA_STATUS_ERROR_UNKNOWN;
- 
--    if (intel_driver_terminate(ctx) == False)
--        return VA_STATUS_ERROR_UNKNOWN;
--
-     i965_destroy_heap(&i965->buffer_heap, i965_destroy_buffer);
-     i965_destroy_heap(&i965->image_heap, i965_destroy_image);
-     i965_destroy_heap(&i965->subpic_heap, i965_destroy_subpic);
-@@ -2409,6 +2406,9 @@ i965_Terminate(VADriverContextP ctx)
-     i965_destroy_heap(&i965->context_heap, i965_destroy_context);
-     i965_destroy_heap(&i965->config_heap, i965_destroy_config);
- 
-+    if (intel_driver_terminate(ctx) == False)
-+        return VA_STATUS_ERROR_UNKNOWN;
-+
-     free(ctx->pDriverData);
-     ctx->pDriverData = NULL;
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19_pre2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19_pre2-r3.ebuild
deleted file mode 100644
index 2e2c3a35fd..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19_pre2-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.0.18.ebuild,v 1.1 2012/06/08 15:31:07 aballier Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	MY_P=${P#libva-}
-	SRC_URI="http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE=""
-
-RDEPEND=">=x11-libs/libva-1.1.0_rc1
-	!<x11-libs/libva-1.0.15[video_cards_intel]
-	>=x11-libs/libdrm-2.4.23[video_cards_intel]"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/va_terminate.patch
-	epatch "${FILESDIR}"/no_explicit_sync_in_va_sync_surface.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/Manifest
deleted file mode 100644
index 14aa63cb00..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libxcb-1.8.1.tar.bz2 375955 SHA256 d2f46811e950710e7e79e45615d24f2c7ec318b9de9dc717972723da58bffa0d SHA512 67cd7141b203e0f5b6f666407671bc9a9ecbc9cc53135ce56b52ec4c40daebe2ac4fb5804617d033413088b7256f34bbd726edfe8f6278b1f03fabf298cafb3b WHIRLPOOL da785782ec119c62bf13148459e2c14b73661e3df0ab9e3c8312e2fe70bd3ab38911832b1adafed2bedeebb79bed1bc4d6a6f15c31b555305f5b4a5140918903
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/libxcb-1.8.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/libxcb-1.8.1.ebuild
deleted file mode 100644
index 5978af728f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/libxcb-1.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.5.ebuild,v 1.2 2009/12/04 21:18:36 remi Exp $
-
-EAPI=3
-
-inherit xorg-2 libtool
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="http://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="doc selinux"
-
-RDEPEND="x11-libs/libXau
-	x11-libs/libXdmcp
-	dev-libs/libpthread-stubs"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-libs/libxslt
-	>=x11-proto/xcb-proto-1.7.1
-	>=dev-lang/python-2.5[xml]"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable doc build-docs)
-		$(use_enable selinux)
-		--enable-xinput"
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_compile() {
-	xorg-2_src_compile XCBPROTO_XCBINCLUDEDIR="${SYSROOT}/usr/share/xcb"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxkbcommon/libxkbcommon-0.0.0_alpha1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxkbcommon/libxkbcommon-0.0.0_alpha1.ebuild
deleted file mode 100644
index 86adbc83af..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxkbcommon/libxkbcommon-0.0.0_alpha1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-EGIT_REPO_URI="http://git.chromium.org/chromiumos/third_party/${PN}.git"
-EGIT_COMMIT="f91afe4f3ebcac3fb65a402c6c85cf1df5e2b52a"
-XORG_EAUTORECONF="yes"
-
-inherit xorg-2 git-2
-
-SRC_URI=""
-
-DESCRIPTION="X.Org xkbcommon library"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="x11-proto/xproto
-	>=x11-proto/kbproto-1.0.5"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xkb-config-root=/usr/share/X11/xkb
-	)
-}
-
-src_prepare() {
-	# http://bugs.gentoo.org/show_bug.cgi?id=386181
-	cat <<-\EOF >> makekeys/Makefile.am
-	CFLAGS = $(BUILD_CFLAGS)
-	CPPFLAGS = $(BUILD_CPPFLAGS)
-	LDFLAGS = $(BUILD_LDFLAGS)
-	EOF
-
-	xorg-2_src_prepare
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/Manifest
deleted file mode 100644
index 638475f446..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pango-1.28.4.tar.bz2 1503441 RMD160 e9dc19b62263fdbd5b58c00092220af87ed929df SHA1 e715954a5a3b358889d15b6235e1965303dbb622 SHA256 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango-1.26.0-lib64.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango-1.26.0-lib64.patch
deleted file mode 100644
index cdbdd5024e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango-1.26.0-lib64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pango/Makefile.am
-+++ pango/Makefile.am
-@@ -16,6 +16,7 @@
- 	-DPANGO_ENABLE_BACKEND				\
- 	-DPANGO_ENABLE_ENGINE				\
- 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
-+	-DHOST=\"$(host_triplet)\"			\
- 	-DLIBDIR=\"$(libdir)\"				\
- 	-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\"	\
- 	-DG_DISABLE_DEPRECATED				\
---- pango/modules.c
-+++ pango/modules.c
-@@ -353,6 +353,7 @@
- 
-   if (!file_str)
-     file_str = g_build_filename (pango_get_sysconf_subdirectory (),
-+				 HOST,
- 				 "pango.modules",
- 				 NULL);
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango.modules b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango.modules
deleted file mode 100644
index 98d1fa82c3..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango.modules
+++ /dev/null
@@ -1,35 +0,0 @@
-# Pango Modules file
-# Automatically generated file, do not edit
-#
-# ModulesPath = /usr/@libdir@/pango/1.6.0/modules
-#
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
-/usr/@libdir@/pango/1.6.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:*
-/usr/@libdir@/pango/1.6.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common:
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:*
-/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:*
-/usr/@libdir@/pango/1.6.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
-/usr/@libdir@/pango/1.6.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:*
-/usr/@libdir@/pango/1.6.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:*
-/usr/@libdir@/pango/1.6.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:*
-/usr/@libdir@/pango/1.6.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*
-/usr/@libdir@/pango/1.6.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:*
-/usr/@libdir@/pango/1.6.0/modules/pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common:
-/usr/@libdir@/pango/1.6.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:*
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4-r3.ebuild
deleted file mode 120000
index 2856591793..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4-r3.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-pango-1.28.4.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4.ebuild
deleted file mode 100644
index e1ea215672..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.1 2011/04/04 21:24:23 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 multilib toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2 FTL"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="X doc introspection test"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=media-libs/fontconfig-2.5.0:1.0
-	media-libs/freetype:2
-	>=x11-libs/cairo-1.7.6[X?]
-	X? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	test? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
-	X? ( x11-proto/xproto )"
-
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
-}
-
-pkg_setup() {
-	tc-export CXX
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_with X x)
-		$(use X && echo --x-includes=${SYSROOT}${EPREFIX}/usr/include)
-		$(use X && echo --x-libraries=${SYSROOT}${EPREFIX}/usr/$(get_libdir))"
-	DOCS="AUTHORS ChangeLog* NEWS README THANKS"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# make config file location host specific so that a 32bit and 64bit pango
-	# wont fight with each other on a multilib system.  Fix building for
-	# emul-linux-x86-gtklibs
-	if multilib_enabled ; then
-		epatch "${FILESDIR}/${PN}-1.26.0-lib64.patch"
-		eautoreconf
-	fi
-
-	elibtoolize # for Darwin bundles
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}/usr/$(get_libdir)/pango/1.6.0/modules" -name "*.la" -delete || die
-	if multilib_enabled; then
-		insinto "/etc/pango/${CHOST}"
-	else
-		insinto /etc/pango
-	fi
-	# TODO(msb): Ugly Hack fix for pango-querymodules pango-querymodules
-	# needs to be run on the target so we ran it on the target and stored
-	# the result which we copy here
-	sed "s:@libdir@:$(get_libdir):g" "${FILESDIR}"/pango.modules \
-		>pango.modules || die
-	doins pango.modules || die
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] ; then
-		einfo "Generating modules listing..."
-
-		local PANGO_CONFDIR=
-
-		if multilib_enabled ; then
-			PANGO_CONFDIR="${EPREFIX}/etc/pango/${CHOST}"
-		else
-			PANGO_CONFDIR="${EPREFIX}/etc/pango"
-		fi
-
-		mkdir -p ${PANGO_CONFDIR}
-
-		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/Manifest
deleted file mode 100644
index 906b276480..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST unclutter-8.tar.Z 12344 RMD160 a78b6e148e7eea8f33b6fe0d6db3ad570889770d SHA1 726e829b41e9cb4d6a14cd91ca7efa02125be2be SHA256 b855a78d4465ab2f86287eacac63a73f1504b08522840aa37718776e7ec9192a
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-disable-tap.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-disable-tap.patch
deleted file mode 100644
index a6ea52ae48..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-disable-tap.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 3c7b93c..30c1e5e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,8 +28,8 @@
-            MANDIR = $(MANSOURCEPATH)1
-             IMAKE = imake
-              XLIB = $(EXTENSIONLIB)  -lX11
--
--  LOCAL_LIBRARIES = $(XLIB)
-+           XINPUT = -lXi -lXext
-+  LOCAL_LIBRARIES = $(XLIB) $(XINPUT)
- 
-  OBJS = unclutter.o
-  SRCS = unclutter.c
-diff --git a/unclutter.c b/unclutter.c
-index 98b30af..934d49e 100644
---- a/unclutter.c
-+++ b/unclutter.c
-@@ -23,6 +23,8 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/Xproto.h>
-+#include <X11/extensions/XInput.h>
-+#include <X11/extensions/XInput2.h>
- #include <stdio.h>
- #include "vroot.h"
- 
-@@ -50,12 +52,144 @@ usage(){
- 	-dontignoremodifiers	don't ignore modifier keys\n\
- 					(requires -keystroke)\n\
- 	-not names...		dont apply to windows whose wm-name begins.\n\
--				(must be last argument)");
-+				(must be last argument)\
-+	-notap <device>");
-+
- }
- 
- #define ALMOSTEQUAL(a,b) (abs(a-b)<=jitter)
- #define ANYBUTTON (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask)
- 
-+static const char* property_name = "Tap Paused";
-+
-+/*
-+ * Method to determine version of the xinput extension
-+ */
-+int xinput_version(display) 
-+Display *display;
-+{
-+	XExtensionVersion *version;
-+	static int vers = -1;
-+
-+	if (vers != -1)
-+		return vers;
-+
-+	version = XGetExtensionVersion(display, INAME);
-+
-+	if (version && (version != (XExtensionVersion*) NoSuchExtension)) {
-+		vers = version->major_version;
-+		XFree(version);
-+	}
-+
-+	return vers;
-+}
-+
-+/*
-+ * Method to find device info for a given name (name can be device name or
-+ * device id)
-+ */
-+XIDeviceInfo* xi2_find_device_info(display, name)
-+Display *display;
-+char *name;
-+{
-+	XIDeviceInfo *info;
-+	int ndevices;
-+	Bool is_id = True;
-+	int i, id = -1;
-+
-+	for (i = 0; i < strlen(name); i++) {
-+		if (!isdigit(name[i])) {
-+			is_id = False;
-+			break;
-+		}
-+	}
-+
-+	if (is_id) {
-+		id = atoi(name);
-+	}
-+
-+	info = XIQueryDevice(display, XIAllDevices, &ndevices);
-+	for (i = 0; i < ndevices; i++) {
-+		if ((is_id && info[i].deviceid == id)
-+				|| (!is_id && strcmp(info[i].name, name) == 0)) {
-+			return &info[i];
-+		}
-+	}
-+
-+	XIFreeDeviceInfo(info);
-+	return NULL;
-+}
-+
-+/*
-+ * Method to set the tap property
-+ */
-+void set_tap_property(display, info, value)
-+Display *display;
-+XIDeviceInfo* info;
-+unsigned char value;
-+{
-+	// Atom for property name
-+	Atom prop = XInternAtom(display, property_name, False);
-+	
-+	// Storage for existing property information
-+	Atom type;
-+	int format;
-+	long unsigned int nitems, bytes;
-+	unsigned char* data;
-+	
-+	// Get existing property to check format
-+	int result = XIGetProperty(display, info->deviceid, prop, 0, 0, False,
-+			AnyPropertyType, &type, &format, &nitems, &bytes, &data);
-+	if (result != Success) {
-+		fprintf(stderr, "Device %d property '%s' does not exist\n",
-+				info->deviceid, property_name);
-+		return;
-+	}
-+	XFree(data);
-+	
-+	// Check if property format is as expected
-+	if (type != XA_INTEGER && format != 8 && nitems != 1) {
-+		fprintf(stderr, "Device %d property '%s' is in wrong format\n",
-+				info->deviceid, property_name);
-+		return;
-+	}
-+
-+	// Change property to new value
-+	XIChangeProperty(display, info->deviceid, prop, XA_INTEGER, 8,
-+			PropModeReplace, &value, 1);
-+}
-+
-+/*
-+ * Check xinput version and return touchpad device info
-+ */
-+XIDeviceInfo* setup_xinput(display, touchpad_device_name)
-+Display *display;
-+char* touchpad_device_name;
-+{
-+	int event, error, xi_opcode;
-+
-+	if (!XQueryExtension(display, "XInputExtension", &xi_opcode, &event,
-+			&error)) {
-+		printf("X Input extension not available.\n");
-+		return 0;
-+	}
-+
-+	if (xinput_version(display) != XI_2_Major) {
-+		fprintf(stderr, "%s extension version 2 not available\n", INAME);
-+		return 0;
-+	}
-+
-+	XIDeviceInfo* info = xi2_find_device_info(display, touchpad_device_name);
-+	if (info == NULL) {
-+		fprintf(stderr, "Cannot find device named %s\n", touchpad_device_name);
-+		return 0;
-+	}
-+
-+	set_tap_property(display, info, 0);
-+
-+	return info;
-+}
-+
- /* Since the small window we create is a child of the window the pointer is
-  * in, it can be destroyed by its adoptive parent.  Hence our destroywindow()
-  * can return an error, saying it no longer exists.  Similarly, the parent
-@@ -218,6 +352,7 @@ Window root;
- 
- main(argc,argv)char **argv;{
-     Display *display;
-+    XIDeviceInfo *touchpad_device = 0;
-     int screen,oldx = -99,oldy = -99,numscreens;
-     int doroot = 0, jitter = 0, idletime = 5, usegrabmethod = 0, waitagain = 0,
- 	dovisible = 1, doevents = 1, onescreen = 0, dontignoremodifiers = 0;
-@@ -225,6 +360,7 @@ main(argc,argv)char **argv;{
-     Window *realroot;
-     Window root;
-     char *displayname = 0;
-+    char *notap_device_name = 0;
-     struct KeyRecord* ignorekeyoverflow = NULL;
-     static unsigned char
- 	ignorekeytable[SLOTCOUNT / (sizeof(unsigned char) * 8)];
-@@ -276,10 +412,18 @@ main(argc,argv)char **argv;{
- 	    argc--,argv++;
- 	    if(argc<0)usage();
- 	    displayname = *argv;
--	}else usage();
-+	}else if(strcmp(*argv,"-notap")==0){
-+    argc--,argv++;
-+    if(argc<0)usage();
-+    notap_device_name = *argv;
-+	}
-+	else usage();
-     }
-     display = XOpenDisplay(displayname);
-     if(display==0)pexit("could not open display");
-+    if(notap_device_name != 0) {
-+      touchpad_device = setup_xinput(display, notap_device_name);
-+    }
-     numscreens = ScreenCount(display);
-     cursor = (Cursor*) malloc(numscreens*sizeof(Cursor));
-     realroot = (Window*) malloc(numscreens*sizeof(Window));
-@@ -387,6 +531,8 @@ main(argc,argv)char **argv;{
- 		    PointerMotionMask|ButtonPressMask|ButtonReleaseMask,
- 		    GrabModeAsync, GrabModeAsync, None, cursor[screen],
- 		    CurrentTime)==GrabSuccess){
-+	      if(touchpad_device) set_tap_property(display, touchpad_device, 1);
-+	      
- 		/* wait for a button event or large cursor motion */
- 		XEvent event;
- 		do{
-@@ -402,7 +548,9 @@ main(argc,argv)char **argv;{
- 			ALMOSTEQUAL(rooty,event.xmotion.y)) ||
- 		       (event.type!=KeyPress && event.type!=MotionNotify));
- 		XUngrabPointer(display, CurrentTime);
-+		if(touchpad_device) set_tap_property(display, touchpad_device, 0); 
- 	    }
-+	    
- 	}else{
- 	    XSetWindowAttributes attributes;
- 	    XEvent event;
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-ignore-some-keys.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-ignore-some-keys.patch
deleted file mode 100644
index 5dec9a0e53..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-ignore-some-keys.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 058c02041246755a0817f7611b275dee397b6f57 Mon Sep 17 00:00:00 2001
-From: Andrew de los Reyes <adlr@chromium.org>
-Date: Wed, 22 Feb 2012 19:23:50 -0800
-Subject: [PATCH] Allow some keys to be ignored when using -keystroke.
-
-Generally, we want most, but not all, keystrokes to hide the
-cursor. Alt-Tab is an example of a keystroke that deals with window
-placement, which may happen while the user is using the mouse, so it's
-nice to not hide the cursor when it is hit. Similarly, modifier keys
-shouldn't hide the cursor, since a user may be trying to Alt-click or
-Alt-drag.
-
-To address these, we create two new options:
-
--ignore: allows a given modifier set and keycode to be specified. It
- will be ignored. This option can be called many times with many
- ignore values.
-
- A simple lookup table is created. There are too many possible
- keycodes to create a full lookup table (Afaik), so this table is
- enough to hold all the common cases (keycodes 0-127 w/ Shift, Ctrl,
- Alt modifiers). For overflow, a linked list of keycodes is used.
-
--dontignoremodifiers: Modifier keys are ignored by default now, but
- with this option they can still cause the cursor to hide.
----
- unclutter.c |  106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 103 insertions(+), 3 deletions(-)
-
-diff --git a/unclutter.c b/unclutter.c
-index 009bad5..98b30af 100644
---- a/unclutter.c
-+++ b/unclutter.c
-@@ -44,6 +44,11 @@ usage(){
- 	-onescreen		apply only to given screen of display\n\
-  	-visible       		ignore visibility events\n\
-  	-noevents      		dont send pseudo events\n\
-+	-ignore <modifiers> <key> neither show nor hide when this key typed\n\
-+					(may be used multiple times;\n\
-+					requires -keystroke)\n\
-+	-dontignoremodifiers	don't ignore modifier keys\n\
-+					(requires -keystroke)\n\
- 	-not names...		dont apply to windows whose wm-name begins.\n\
- 				(must be last argument)");
- }
-@@ -66,6 +71,80 @@ XErrorEvent *error;
- 	(*defaulthandler)(display,error);
- }
- 
-+struct KeyRecord {
-+    unsigned int state;
-+    unsigned int keycode;
-+    struct KeyRecord *next;
-+};
-+
-+/* Returns -1 if doesn't fit in table, and should use overflow */
-+ssize_t keystoreslot(state, keycode)
-+unsigned int state;
-+unsigned int keycode;
-+{
-+    /* 7 bits for keycode then 3 bits for state: shift, ctrl, mod1 (alt). */
-+    if (keycode > 0x7f)
-+	return -1;
-+    if (state & ~(ShiftMask | ControlMask | Mod1Mask))
-+	return -1;  /* Doesn't fit w/ modifiers */
-+    ssize_t ret = keycode;
-+    ret |= ((state & ShiftMask)   ? 1 : 0) << 7;
-+    ret |= ((state & ControlMask) ? 1 : 0) << 8;
-+    ret |= ((state & Mod1Mask)    ? 1 : 0) << 9;
-+    return ret;
-+}
-+
-+/* 10 bits per modifier + keycode entry */
-+#define SLOTCOUNT (1 << 10)
-+
-+void keystoreset(table, overflow, state, keycode)
-+unsigned char *table;
-+struct KeyRecord **overflow;
-+unsigned int state;
-+unsigned int keycode;
-+{
-+    ssize_t slot = keystoreslot(state, keycode);
-+    if (slot < 0) {
-+	struct KeyRecord* elt = malloc(sizeof(struct KeyRecord));
-+	if (elt == NULL) {
-+	    fprintf(stderr,
-+	      "malloc failed. Some ignore key requests will not be honored.\n");
-+	    return;
-+	}
-+	elt->state = state;
-+	elt->keycode = keycode;
-+	elt->next = *overflow;
-+	*overflow = elt;
-+	return;
-+    }
-+    size_t byteindex = slot / (sizeof(*table) * 8);
-+    size_t bitindex = slot % (sizeof(*table) * 8);
-+    table[byteindex] |= 1 << bitindex;
-+}
-+
-+int keystoreget(table, overflow, state, keycode)
-+unsigned char *table;
-+struct KeyRecord *overflow;
-+unsigned int state;
-+unsigned int keycode;
-+{
-+    ssize_t slot = keystoreslot(state, keycode);
-+    if (slot < 0) {
-+	while (overflow &&
-+	       (state != overflow->state || keycode != overflow->keycode))
-+	    overflow = overflow->next;
-+	return overflow != NULL;
-+    }
-+    size_t byteindex = slot / (sizeof(*table) * 8);
-+    size_t bitindex = slot % (sizeof(*table) * 8);
-+    return (table[byteindex] & (1 << bitindex)) != 0;
-+}
-+
-+int ismodifier(Display *display, unsigned int keycode) {
-+    KeySym ks = XKeycodeToKeysym(display, keycode, 0);
-+    return ks >= XK_Shift_L && ks <= XK_Hyper_R;
-+}
-+
- void XSelectAll(display, window, type)
- Display *display;
- Window window;
-@@ -141,12 +220,18 @@ main(argc,argv)char **argv;{
-     Display *display;
-     int screen,oldx = -99,oldy = -99,numscreens;
-     int doroot = 0, jitter = 0, idletime = 5, usegrabmethod = 0, waitagain = 0,
--	dovisible = 1, doevents = 1, onescreen = 0;
-+	dovisible = 1, doevents = 1, onescreen = 0, dontignoremodifiers = 0;
-     Cursor *cursor;
-     Window *realroot;
-     Window root;
-     char *displayname = 0;
--    
-+    struct KeyRecord* ignorekeyoverflow = NULL;
-+    static unsigned char
-+	ignorekeytable[SLOTCOUNT / (sizeof(unsigned char) * 8)];
-+    unsigned int modifier;
-+    unsigned int keycode;
-+
-+    memset(ignorekeytable, 0, sizeof(ignorekeytable));
-     progname = *argv;
-     argc--;
-     while(argv++,argc-->0){
-@@ -156,6 +241,16 @@ main(argc,argv)char **argv;{
- 	    idletime = atoi(*argv);
- 	}else if(strcmp(*argv,"-keystroke")==0){
- 	    idletime = -1;
-+	}else if(strcmp(*argv,"-ignore")==0){
-+	    argc--,argv++;
-+	    if(argc<0)usage();
-+	    modifier = atoi(*argv);
-+	    argc--,argv++;
-+	    if(argc<0)usage();
-+	    keycode = atoi(*argv);
-+	    keystoreset(ignorekeytable, &ignorekeyoverflow, modifier, keycode);
-+	}else if(strcmp(*argv,"-dontignoremodifiers")==0){
-+	    dontignoremodifiers = 1;
- 	}else if(strcmp(*argv,"-jitter")==0){
- 	    argc--,argv++;
- 	    if(argc<0)usage();
-@@ -236,7 +331,12 @@ main(argc,argv)char **argv;{
- 			continue;
- 		    }
- 		}while(event.type != KeyPress ||
--		       (event.xkey.state & ANYBUTTON));
-+		       (event.xkey.state & ANYBUTTON) ||
-+		       keystoreget(ignorekeytable, ignorekeyoverflow,
-+				   event.xkey.state & ~ANYBUTTON,
-+				   event.xkey.keycode) ||
-+		       (!dontignoremodifiers &&
-+			ismodifier(display, event.xkey.keycode)));
- 		oldx = event.xkey.x_root;
- 		oldy = event.xkey.y_root;
- 	    }
--- 
-1.7.3.4
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-keypress.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-keypress.patch
deleted file mode 100644
index b4e34587a9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-keypress.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1e9863e2ae8466ba3abe9f44787d1ac5770edf19 Mon Sep 17 00:00:00 2001
-From: Andrew de los Reyes <adlr@chromium.org>
-Date: Mon, 20 Feb 2012 17:22:13 -0800
-Subject: [PATCH 1/3] Take action on KeyPress, not KeyRelease
-
-When using KeyRelease, it feels like there is a delay between using
-the keyboard and cursor disappearing, which makes it feel unpolished.
----
- unclutter.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/unclutter.c b/unclutter.c
-index 23bb99b..ab4e039 100644
---- a/unclutter.c
-+++ b/unclutter.c
-@@ -180,7 +180,7 @@ main(argc,argv)char **argv;{
- 	    realroot[screen] = XRootWindow(display,screen);
- 	    cursor[screen] = createnullcursor(display,realroot[screen]);
- 	    if(idletime<0)
--		XSelectInput(display,realroot[screen],KeyReleaseMask);
-+		XSelectInput(display,realroot[screen],KeyPressMask);
- 	}
-     screen = DefaultScreen(display);
-     root = VirtualRootWindow(display,screen);
-@@ -209,7 +209,7 @@ main(argc,argv)char **argv;{
- 		XEvent event;
- 		do{
- 		    XNextEvent(display,&event);
--		}while(event.type != KeyRelease ||
-+		}while(event.type != KeyPress ||
- 		       (event.xkey.state & ANYBUTTON));
- 		oldx = event.xkey.x_root;
- 		oldy = event.xkey.y_root;
-@@ -265,7 +265,7 @@ main(argc,argv)char **argv;{
- 		XEvent event;
- 		do{
- 		    XNextEvent(display,&event);
--		}while(event.type==KeyRelease ||
-+		}while(event.type==KeyPress ||
- 		       (event.type==MotionNotify &&
- 			ALMOSTEQUAL(rootx,event.xmotion.x) &&
- 			ALMOSTEQUAL(rooty,event.xmotion.y)));
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-listen-to-all-windows.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-listen-to-all-windows.patch
deleted file mode 100644
index de3bd5cc0d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-listen-to-all-windows.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From f5e6e228207e82f1ff69f1d4d04f9ad53d3dfc02 Mon Sep 17 00:00:00 2001
-From: Andrew de los Reyes <adlr@chromium.org>
-Date: Mon, 20 Feb 2012 17:29:57 -0800
-Subject: [PATCH 2/3] Select keystrokes from all windows, not just root.
-
-To do this, we create a new function XSelectAll, that calls
-XSelectInput on a tree of windows. Also, watch for CreateNotify
-events, which indicate a new window is created, and when that happens,
-call XSelectAll on it to get key events.
----
- unclutter.c |   41 +++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 39 insertions(+), 2 deletions(-)
-
-diff --git a/unclutter.c b/unclutter.c
-index ab4e039..009bad5 100644
---- a/unclutter.c
-+++ b/unclutter.c
-@@ -66,6 +66,26 @@ XErrorEvent *error;
- 	(*defaulthandler)(display,error);
- }
- 
-+void XSelectAll(display, window, type)
-+Display *display;
-+Window window;
-+unsigned long type;
-+{
-+    Window parent;
-+    Window *children;
-+    unsigned int nchildren;
-+    int status, i;
-+    XSelectInput(display, window, type);
-+
-+    status = XQueryTree(display, window, &window,
-+			&parent, &children, &nchildren);
-+    if (status == 0 || nchildren == 0)
-+	return;
-+    for (i = 0; i < nchildren; i++)
-+	XSelectAll(display, children[i], type);
-+    XFree((char *)children);
-+}
-+
- char **names;	/* -> argv list of names to avoid */
- 
- /*
-@@ -180,7 +200,8 @@ main(argc,argv)char **argv;{
- 	    realroot[screen] = XRootWindow(display,screen);
- 	    cursor[screen] = createnullcursor(display,realroot[screen]);
- 	    if(idletime<0)
--		XSelectInput(display,realroot[screen],KeyPressMask);
-+		XSelectAll(display, realroot[screen],
-+			   KeyPressMask|SubstructureNotifyMask);
- 	}
-     screen = DefaultScreen(display);
-     root = VirtualRootWindow(display,screen);
-@@ -209,6 +230,11 @@ main(argc,argv)char **argv;{
- 		XEvent event;
- 		do{
- 		    XNextEvent(display,&event);
-+		    if (event.type == CreateNotify) {
-+			XSelectAll(display, event.xcreatewindow.parent,
-+				   KeyPressMask|SubstructureNotifyMask);
-+			continue;
-+		    }
- 		}while(event.type != KeyPress ||
- 		       (event.xkey.state & ANYBUTTON));
- 		oldx = event.xkey.x_root;
-@@ -265,10 +291,16 @@ main(argc,argv)char **argv;{
- 		XEvent event;
- 		do{
- 		    XNextEvent(display,&event);
-+		    if (event.type == CreateNotify) {
-+			XSelectAll(display, event.xcreatewindow.parent,
-+				   KeyPressMask|SubstructureNotifyMask);
-+			continue;
-+		    }
- 		}while(event.type==KeyPress ||
- 		       (event.type==MotionNotify &&
- 			ALMOSTEQUAL(rootx,event.xmotion.x) &&
--			ALMOSTEQUAL(rooty,event.xmotion.y)));
-+			ALMOSTEQUAL(rooty,event.xmotion.y)) ||
-+		       (event.type!=KeyPress && event.type!=MotionNotify));
- 		XUngrabPointer(display, CurrentTime);
- 	    }
- 	}else{
-@@ -333,6 +365,11 @@ main(argc,argv)char **argv;{
- 		/* wait till pointer leaves window */
- 		do{
- 		    XNextEvent(display,&event);
-+		    if (event.type == CreateNotify) {
-+			XSelectAll(display, event.xcreatewindow.parent,
-+			KeyPressMask|SubstructureNotifyMask);
-+			continue;
-+		    }
- 		}while(event.type!=LeaveNotify &&
- 		       event.type!=FocusOut &&
- 		       event.type!=UnmapNotify &&
--- 
-1.7.7.3
-
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter.conf b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter.conf
deleted file mode 100644
index 3c515abed9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description     "Unclutter (hides cursor while typing)"
-author          "chromium-os-dev@chromium.org"
-
-# This daemon maintains a connection to the X server, thus it uses
-# non-standard start/stop conditions:
-start on login-prompt-visible
-stop on stopping ui
-
-respawn
-
-env XAUTHORITY=/home/chronos/.Xauthority
-env DISPLAY=:0.0
-
-script
-IGNORE="        -ignore 8 23"  # Alt-Tab
-IGNORE="$IGNORE -ignore 4 23"  # Ctrl-Tab
-IGNORE="$IGNORE -ignore 0 71"  # F5 (Switch Windows)
-IGNORE="$IGNORE -ignore 4 71"  # Ctrl-F5 (Screenshot)
-IGNORE="$IGNORE -ignore 5 71"  # Ctrl-Shift-F5 (Partial Screenshot)
-IGNORE="$IGNORE -ignore 8 36"  # Alt-Enter
-IGNORE="$IGNORE -ignore 4 57"  # Ctrl-N
-IGNORE="$IGNORE -ignore 4 58"  # Ctrl-M
-IGNORE="$IGNORE -ignore 4 25"  # Ctrl-W
-IGNORE="$IGNORE -ignore 1  9"  # Shift-Esc
-for i in $(seq 10 18); do
-  IGNORE="$IGNORE -ignore 4 $i"  # Ctrl-{1-9}
-  IGNORE="$IGNORE -ignore 8 $i"  # Alt-{1-9}
-done
-TPID=`/opt/google/touchpad/tpcontrol_xinput listdev`
-exec sudo -u chronos unclutter -keystroke -notap $TPID -grab $IGNORE
-end script
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/unclutter-8-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/unclutter-8-r7.ebuild
deleted file mode 100644
index e4fc140927..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/unclutter-8-r7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/unclutter/unclutter-8-r1.ebuild,v 1.9 2007/07/22 03:41:55 dberkholz Exp $
-
-inherit eutils toolchain-funcs
-
-S="${WORKDIR}/${PN}"
-DESCRIPTION="Hides mouse pointer while not in use."
-HOMEPAGE="http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README"
-SRC_URI="ftp://ftp.x.org/contrib/utilities/${P}.tar.Z"
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_compile() {
-	# src_prepare fails in this ebuild, so patch here
-	epatch "${FILESDIR}/${P}-keypress.patch"
-	epatch "${FILESDIR}/${P}-listen-to-all-windows.patch"
-	epatch "${FILESDIR}/${P}-ignore-some-keys.patch"
-	epatch "${FILESDIR}/${P}-disable-tap.patch"
-	# This xmkmf appears unnecessary
-	# xmkmf -a || die "Couldn't run xmkmf"
-	emake -j1 CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install () {
-	dobin unclutter
-	newman unclutter.man unclutter.1x
-	dodoc README
-	insinto /etc/init
-	doins "${FILESDIR}/unclutter.conf"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/Manifest
deleted file mode 100644
index 1b675386cb..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xkeyboard-config-2.4.1.tar.bz2 813373 SHA256 f048bdd6e3d71c621b5a47a7ee72d691eda1922e0e07808b157b292e0c857a0a SHA512 3c4de68c7c2a7fd91b183198f59e8b0ed96770489531f72015a9c8fe42dc3d0a81002fd0f4f4ce1c616e4f1fdcf1868f4057f1e0f9d1685d4ec7b74148b9b9ea WHIRLPOOL a411a1b34a566127dada34f181ca60835194f9b2fb6d0024c0f476c2c449c74ef58238d0c259b63b09fb206a3355fecdd0ce9a30eaf01d5f12607b926612d8c8
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-add-f19-24.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-add-f19-24.patch
deleted file mode 100644
index 98a46a7567..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-add-f19-24.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur xkb.orig/symbols/inet xkb/symbols/inet
---- xkb.orig/symbols/inet	2012-10-22 10:33:09.099377948 -0700
-+++ xkb/symbols/inet	2012-10-22 10:46:28.635298140 -0700
-@@ -225,6 +225,12 @@
-     key <FK16>   {      [ XF86Launch7       ]       };
-     key <FK17>   {      [ XF86Launch8       ]       };
-     key <FK18>   {      [ XF86Launch9       ]       };
-+    key <FK19>   {      [ F19       ]       };
-+    key <FK20>   {      [ F20       ]       };
-+    key <FK21>   {      [ F21       ]       };
-+    key <FK22>   {      [ F22       ]       };
-+    key <FK23>   {      [ F23       ]       };
-+    key <FK24>   {      [ F24       ]       };
- };
- 
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-colemack-neo-capslock-remap.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-colemack-neo-capslock-remap.patch
deleted file mode 100644
index b2dc261bad..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-colemack-neo-capslock-remap.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur xkeyboard-config-2.4.1.orig/symbols/de xkeyboard-config-2.4.1/symbols/de
---- xkeyboard-config-2.4.1.orig/symbols/de	2011-10-05 07:19:54.000000000 +0900
-+++ xkeyboard-config-2.4.1/symbols/de	2012-02-14 19:28:04.752942409 +0900
-@@ -383,6 +383,7 @@
- 
-     include "shift(both_capslock)"
-     include "level3(caps_switch)"
-+    include "level3(lwin_switch)"
-     include "level3(bksl_switch)"
-     include "level5(lsgt_switch)"
-     include "level5(ralt_switch)"
-diff -ur xkeyboard-config-2.4.1.orig/symbols/us xkeyboard-config-2.4.1/symbols/us
---- xkeyboard-config-2.4.1.orig/symbols/us	2011-10-05 07:19:54.000000000 +0900
-+++ xkeyboard-config-2.4.1/symbols/us	2012-02-14 19:28:54.812726287 +0900
-@@ -789,6 +789,7 @@
-     key <AB10> { [        slash,     question,    questiondown,       asciitilde ] };
- 
-     key <CAPS> { [    BackSpace,    BackSpace,       BackSpace,        BackSpace ] };
-+    key <LWIN> { [    BackSpace,    BackSpace,       BackSpace,        BackSpace ] };
-     key <LSGT> { [        minus,   underscore,          endash,           emdash ] };
-     key <SPCE> { [        space,        space,           space,     nobreakspace ] };
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch
deleted file mode 100644
index 07ce1dcc1a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 1d1338afa6aa555c5f6c83d07fceec43a4d87f0d Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov <svu@gnome.org>
-Date: Wed, 05 Oct 2011 21:26:26 +0000
-Subject: Levels 2-4 for CTRL+ALT are propagated from level 1
-
----
-diff --git a/symbols/keypad b/symbols/keypad
-index e85aaac..1bab391 100644
---- a/symbols/keypad
-+++ b/symbols/keypad
-@@ -84,19 +84,19 @@ xkb_symbols "x11" {
- // Ungrab cancels server/keyboard/pointer grabs
-     key <KPDV> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
-+        symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
-     };
- 
- // ClsGrb kills whichever client has a grab in effect
-     key <KPMU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Multiply,	VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
-+        symbols[Group1]= [ KP_Multiply,	KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
-     };
- 
- // -VMode switches to the previous video mode
-     key <KPSU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
-+        symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
-     };
- 
-     key  <KP7> {	[  KP_Home,	KP_7	]	};
-@@ -106,7 +106,7 @@ xkb_symbols "x11" {
- // +VMode switches to the next video mode
-     key <KPAD> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
-+        symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ]
-     };
- 
-     key  <KP4> {	[  KP_Left,	KP_4	]	};
-@@ -242,11 +242,11 @@ xkb_symbols "legacymath" {
- 
-     key.type[Group1]="CTRL+ALT" ;
- 
--    key <KPDV> { [   KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // / <XF86_Ungrab>
--    key <KPMU> { [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // * <XF86_ClearGrab>
--    key <KPSU> { [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
-+    key <KPDV> { [   KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] }; // / <XF86_Ungrab>
-+    key <KPMU> { [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; // * <XF86_ClearGrab>
-+    key <KPSU> { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
- 
--    key <KPAD> { [      KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
-+    key <KPAD> { [      KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
- 
- };
- 
-@@ -602,7 +602,7 @@ xkb_symbols "numoperdecsep" {
- // ClsGrb kills whichever client has a grab in effect
-     key <KOMU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
-+        symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
-     };
- 
-     key  <KO4> {	[  KP_4	]	};
-@@ -611,7 +611,7 @@ xkb_symbols "numoperdecsep" {
- // -VMode switches to the previous video mode
-     key <KOSU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
-+        symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
-     };
- 
-     key  <KO1> {	[  KP_1	]	};
-@@ -620,7 +620,7 @@ xkb_symbols "numoperdecsep" {
- // +VMode switches to the next video mode
-     key <KOAD> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
-+        symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ]
-     };
- 
-     key  <KO0> {	[  KP_0	]	};
-@@ -628,6 +628,6 @@ xkb_symbols "numoperdecsep" {
- // Ungrab cancels server/keyboard/pointer grabs
-     key <KODV> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
-+        symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
-     };
- };
-diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
-index 7d47d66..73b5af2 100644
---- a/symbols/srvr_ctrl
-+++ b/symbols/srvr_ctrl
-@@ -12,25 +12,25 @@ xkb_symbols "stdkeypad" {
- // Ungrab cancels server/keyboard/pointer grabs
-     key <KPDV> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
-+	symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
-     };
- 
- // ClsGrb kills whichever client has a grab in effect
-     key <KPMU> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
-+	symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
-     };
- 
- // -VMode switches to the previous video mode
-     key <KPSU> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
-+	symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
-     };
- 
- // +VMode switches to the next video mode
-     key <KPAD> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode]
-+	symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode]
-     };
- 
- };
-@@ -40,62 +40,62 @@ xkb_symbols "fkey2vt" {
- 
-     key <FK01> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ]
-+	symbols[Group1]= [ F1, F1, F1, F1, XF86_Switch_VT_1 ]
-     };
- 
-     key <FK02> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ]
-+	symbols[Group1]= [ F2, F2, F2, F2, XF86_Switch_VT_2 ]
-     };
- 
-     key <FK03> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ]
-+	symbols[Group1]= [ F3, F3, F3, F3, F3 ]
-     };
- 
-     key <FK04> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ]
-+	symbols[Group1]= [ F4, F4, F4, F4, F4 ]
-     };
- 
-     key <FK05> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ]
-+	symbols[Group1]= [ F5, F5, F5, F5, F5 ]
-     };
- 
-     key <FK06> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ]
-+	symbols[Group1]= [ F6, F6, F6, F6, F6 ]
-     };
- 
-     key <FK07> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ]
-+	symbols[Group1]= [ F7, F7, F7, F7, F7 ]
-     };
- 
-     key <FK08> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ]
-+	symbols[Group1]= [ F8, F8, F8, F8, F8 ]
-     };
- 
-     key <FK09> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ]
-+	symbols[Group1]= [ F9, F9, F9, F9, F9 ]
-     };
- 
-     key <FK10> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ]
-+	symbols[Group1]= [ F10, F10, F10, F10, F10 ]
-     };
- 
-     key <FK11> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ]
-+	symbols[Group1]= [ F11, F11, F11, F11, F11 ]
-     };
- 
-     key <FK12> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ]
-+	symbols[Group1]= [ F12, F12, F12, F12, F12 ]
-     };
- 
- };
-diff --git a/symbols/terminate b/symbols/terminate
-index 96dd6e8..c74220b 100644
---- a/symbols/terminate
-+++ b/symbols/terminate
-@@ -2,6 +2,6 @@ partial default modifier_keys
- xkb_symbols "ctrl_alt_bksp" {
-     key <BKSP> {
-         type="CTRL+ALT",
--        symbols[Group1] = [ NoSymbol, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ]
-+        symbols[Group1] = [ NoSymbol, NoSymbol, NoSymbol, NoSymbol, Terminate_Server ]
-     };
- };
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-dvorak-deadkey.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-dvorak-deadkey.patch
deleted file mode 100644
index ca6405cc01..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-dvorak-deadkey.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-With UK layouts, the grave key should operate as a dead key,
-and the bar should be broken.
-Additionally, vowels should be given an acute accent when AltGr is pressed.
-
-diff -uNr xkeyboard-config-1.7.orig/symbols/gb xkeyboard-config-1.7/symbols/gb
---- xkeyboard-config-1.7.orig/symbols/gb	2009-08-15 23:31:43.000000000 +0900
-+++ xkeyboard-config-1.7/symbols/gb	2011-05-19 12:56:47.000000000 +0900
-@@ -151,7 +151,15 @@ xkb_symbols "dvorak" {
-     key <AE03> { [	    3,	sterling,  threesuperior, NoSymbol	] };
-     key <BKSL> { [ numbersign,	asciitilde	] };
-     key <LSGT> { [  backslash,	bar		] };
--    key <TLDE> { [	grave,	notsign,   bar,           bar		] };
-+    key <TLDE> { [  deadgrave, notsign,   brokenbar,     brokenbar     ] };
-+    key <AC01> { [         a,        A,   aacute,        Aacute        ] };
-+    key <AC02> { [         o,        O,   oacute,        Oacute        ] };
-+    key <AC03> { [         e,        E,   eacute,        Eacute        ] };
-+    key <AC04> { [         u,        U,   uacute,        Uacute        ] };
-+    key <AC05> { [         i,        I,   iacute,        Iacute        ] };
-+    key <AD05> { [         y,        Y,   yacute,        Yacute        ] };
-+    key <AD08> { [         c,        C, ccedilla,        Ccedilla      ] };
-+    key <AB08> { [         w,        W,   wacute,        Wacute        ] };
- };
- 
- // Dvorak letter positions, but punctuation all in the normal UK positions.
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-extd-deadkey.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-extd-deadkey.patch
deleted file mode 100644
index a0a627c9f4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-extd-deadkey.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xkeyboard-config-2.4.1.orig/symbols/gb xkeyboard-config-2.4.1/symbols/gb
---- xkeyboard-config-2.4.1.orig/symbols/gb	2012-11-22 14:40:25.858449142 +0900
-+++ xkeyboard-config-2.4.1/symbols/gb	2012-11-26 13:55:13.877729860 +0900
-@@ -75,7 +75,7 @@
-     name[Group1]="English (UK, extended WinKeys)";
-     
-     // Alphanumeric section
--    key <TLDE> { [ dead_grave,    notsign,       brokenbar,    NoSymbol ] };
-+    key <TLDE> { [ grave,    notsign,       brokenbar,    NoSymbol ] };
-     
-     key <AE02> { [     2,        quotedbl,  dead_diaeresis,     onehalf ] };
-     key <AE03> { [     3,        sterling,   threesuperior,    onethird ] };
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-no-keyboard.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-no-keyboard.patch
deleted file mode 100644
index 6034bb75c7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-no-keyboard.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur xkeyboard-config-2.4.1.orig/rules/base.xml.in xkeyboard-config-2.4.1/rules/base.xml.in
---- xkeyboard-config-2.4.1.orig/rules/base.xml.in	2011-10-05 07:19:54.000000000 +0900
-+++ xkeyboard-config-2.4.1/rules/base.xml.in	2012-02-14 19:20:13.944976247 +0900
-@@ -3708,7 +3708,8 @@
-         <_shortDescription>no</_shortDescription>
-         <_description>Norwegian</_description>
-         <languageList>
--          <iso639Id>nor</iso639Id>
-+          <iso639Id>nob</iso639Id>
-+          <iso639Id>nno</iso639Id>
-         </languageList>
-       </configItem>
-       <variantList>
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-parrot-euro-sign.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-parrot-euro-sign.patch
deleted file mode 100644
index b26420bb82..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-parrot-euro-sign.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -urN xkeyboard-config-2.4.1.orig/rules/compat/layoutsMapping.lst xkeyboard-config-2.4.1/rules/compat/layoutsMapping.lst
---- xkeyboard-config-2.4.1.orig/rules/compat/layoutsMapping.lst	2012-11-14 14:08:33.999093026 +0900
-+++ xkeyboard-config-2.4.1/rules/compat/layoutsMapping.lst	2012-11-14 17:03:26.637971159 +0900
-@@ -25,3 +25,6 @@
- yu	srp
- fr-latin9 fr(latin9)
- us_intl	us(alt-intl)
-+# To be us(euro) as the default us keyboard layout on parrot, overwrite us
-+# layout mapping to us(euro).
-+us us(euro)
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-capslock.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-capslock.patch
deleted file mode 100644
index 9f94cbd4a0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-capslock.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN xkeyboard-config-2.4.1.org/symbols/pc xkeyboard-config-2.4.1/symbols/pc
---- xkeyboard-config-2.4.1.org/symbols/pc	2013-01-17 15:09:37.104779731 +0900
-+++ xkeyboard-config-2.4.1/symbols/pc	2013-01-17 15:11:40.836636784 +0900
-@@ -19,7 +19,10 @@
-     key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
-     key <RTRN> {	[ Return	]	};
- 
--    key <CAPS> {	[ Caps_Lock	]	};
-+    // Generate a non Caps_Lock symbol (F16) for <CAPS> to allow the user to
-+    // remap the key. Chrome remaps the F16 key symbol back to VKEY_CAPITAL when
-+    // needed. crbug.com/146204.
-+    key <CAPS> {	[ XF86Launch7	]	};
- 
-     key <NMLK> {	[ Num_Lock 	]	};
- 
-@@ -40,6 +43,9 @@
-     modifier_map Lock   { Caps_Lock, ISO_Lock };
-     modifier_map Control{ Control_L, Control_R };
-     modifier_map Mod2   { Num_Lock };
-+    // Use <CAPS> as Mod3. The Mod3Mask mask will be remapped to ControlMask,
-+    // Mod1Mask (Alt), etc. in Chrome. crbug.com/146204
-+    modifier_map Mod3   { <CAPS> };
-     modifier_map Mod4   { Super_L, Super_R };
- 
-     //  Fake keys for virtual<->real modifiers mapping 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-f15-as-mod2mask.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-f15-as-mod2mask.patch
deleted file mode 100644
index 350edae348..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-f15-as-mod2mask.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN xkeyboard-config-2.4.1.org/symbols/pc xkeyboard-config-2.4.1/symbols/pc
---- xkeyboard-config-2.4.1.org/symbols/pc	2013-01-17 13:51:15.974219536 +0900
-+++ xkeyboard-config-2.4.1/symbols/pc	2013-01-17 14:31:45.361168332 +0900
-@@ -42,7 +42,9 @@
-     modifier_map Shift  { Shift_L, Shift_R };
-     modifier_map Lock   { Caps_Lock, ISO_Lock };
-     modifier_map Control{ Control_L, Control_R };
--    modifier_map Mod2   { Num_Lock };
-+    // Keep Num_Lock as Mod2 modifier. Mod2 is used as both NumLock modifier
-+    // and diamond key modifier.
-+    modifier_map Mod2   { Num_Lock, XF86Launch6 };
-     // Use <CAPS> as Mod3. The Mod3Mask mask will be remapped to ControlMask,
-     // Mod1Mask (Alt), etc. in Chrome. crbug.com/146204
-     modifier_map Mod3   { <CAPS> };
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch
deleted file mode 100644
index 9c526af13a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 9966d0a83ad7cf5ea76a04f31912e92908f3da63 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniel@fooishbar.org>
-Date: Thu, 19 Jan 2012 16:36:16 +1100
-Subject: [PATCH] Hide ClearGrab/CloseGrabs actions behind an option
-
-Similar to how we put the Terminate mapping behind an option rather than
-enabling it by default, put the ClearGrab/CloseGrab action handlers
-behind an option too, so we don't ship 'break my screensaver'.  Oops.
-
-Signed-off-by: Daniel Stone <daniel@fooishbar.org>
----
- compat/xfree86      |   15 +++++++++------
- rules/base.o_c.part |    1 +
- rules/base.xml.in   |    6 ++++++
- 3 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/compat/xfree86 b/compat/xfree86
-index cf4a8b2..52e661d 100644
---- a/compat/xfree86
-+++ b/compat/xfree86
-@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic"  {
-         action = SwitchScreen(Screen=12, !SameServer);
-     };
- 
--    interpret XF86_Ungrab {
--        action = Private(type=0x86, data="Ungrab");
--    };
--    interpret XF86_ClearGrab {
--        action = Private(type=0x86, data="ClsGrb");
--    };
-     interpret XF86LogGrabInfo {
-         action = Private(type=0x86, data="PrGrbs");
-     };
-@@ -61,3 +55,12 @@ default partial xkb_compatibility "basic"  {
-         action = Private(type=0x86, data="-VMode");
-     };
- };
-+
-+partial xkb_compatibility "grab_break" {
-+    interpret XF86_Ungrab {
-+        action = Private(type=0x86, data="Ungrab");
-+    };
-+    interpret XF86_ClearGrab {
-+        action = Private(type=0x86, data="ClsGrb");
-+    };
-+};
-diff --git a/rules/base.o_c.part b/rules/base.o_c.part
-index 352f8b3..b80ab6d 100644
---- a/rules/base.o_c.part
-+++ b/rules/base.o_c.part
-@@ -3,4 +3,5 @@
-   grp_led:scroll	=	+ledscroll(group_lock)
-   japan:kana_lock	=	+japan(kana_lock)
-   caps:shiftlock	=	+ledcaps(shift_lock)
-+  grab:break_actions    =       +xfree86(grab_break)
- 
-diff --git a/rules/base.xml.in b/rules/base.xml.in
-index 22b720f..6c17faa 100644
---- a/rules/base.xml.in
-+++ b/rules/base.xml.in
-@@ -6278,6 +6278,12 @@
-           <_description>Toggle PointerKeys with Shift + NumLock.</_description>
-         </configItem>
-       </option>
-+      <option>
-+        <configItem>
-+          <name>grab:break_actions</name>
-+          <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description>
-+        </configItem>
-+      </option>
-     </group>
-     <group allowMultipleSelection="true">
-       <!-- Special shortcuts for the Euro character -->
--- 
-1.7.8.3
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r15.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r15.ebuild
deleted file mode 100644
index 44165037ec..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r15.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild,v 1.5 2012/01/24 12:52:59 jer Exp $
-
-EAPI=4
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="parrot"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=x11-apps/xkbcomp-1.2.1
-	>=x11-libs/libX11-1.4.2"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-	--enable-compat-rules
-	# do not check for runtime deps
-	--disable-runtime-deps
-	--with-xkb-rules-symlink=xorg
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-extended-function-keys.patch
-	"${FILESDIR}"/xorg-cve-2012-0064.patch
-	"${FILESDIR}"/${P}-gb-dvorak-deadkey.patch
-	"${FILESDIR}"/${P}-no-keyboard.patch
-	"${FILESDIR}"/${P}-colemack-neo-capslock-remap.patch
-	"${FILESDIR}"/${P}-remap-capslock.patch
-	"${FILESDIR}"/${P}-add-f19-24.patch
-	"${FILESDIR}"/${P}-gb-extd-deadkey.patch
-	"${FILESDIR}"/${P}-remap-f15-as-mod2mask.patch
-)
-
-use parrot && PATCHES+=( "${FILESDIR}"/${P}-parrot-euro-sign.patch )
-
-src_prepare() {
-	xorg-2_src_prepare
-	if [[ ${XORG_EAUTORECONF} != no ]]; then
-		intltoolize --copy --automake || die
-	fi
-}
-
-src_compile() {
-	# cleanup to make sure .dir files are regenerated
-	# bug #328455 c#26
-	xorg-2_src_compile clean
-	xorg-2_src_compile
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/Manifest
deleted file mode 100644
index 668974f065..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xcb-proto-1.7.1.tar.bz2 106040 SHA256 ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437 SHA512 3c44ff3d353ff2b8f7525d4bbce8e03f6e102617670797f7e28f8880df44709dcdf2e15d38ad56139e1f067c5ce8b0816edb0b06474271f18f90146328bd8a57 WHIRLPOOL 5fa8c16c378ff18eac92f45304a5e8b1720eb46c4ed53c2b83f560d0d7be547b623a56d3ef35cb6e6e4cd4a7f4ebf206c2991346f1071c9fc6709834cfb92e55
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild
deleted file mode 100644
index 642a7c3768..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.6-r2.ebuild,v 1.5 2011/12/27 21:13:20 maekke Exp $
-
-EAPI=3
-PYTHON_DEPEND="2:2.5"
-
-inherit python xorg-2
-
-DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="http://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-libs/libxml2"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	xorg-2_src_prepare
-}
-
-src_install() {
-	xorg-2_src_install
-	python_clean_installation_image
-}
-
-pkg_postinst() {
-	python_mod_optimize xcbgen
-	ewarn "Please rebuild both libxcb and xcb-util if you are upgrading from version 1.6"
-}
-
-pkg_postrm() {
-	python_mod_cleanup xcbgen
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/Manifest
deleted file mode 100644
index 9b8df2a0c3..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xextproto-7.2.0.tar.bz2 207724 RMD160 f7ea5722a70d64c62f8cf0bea0b53fbf2688166a SHA1 a117fb9d7fdebee7af3f9e79efe9812e39e650a5 SHA256 d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/xextproto-7.2.0.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/xextproto-7.2.0.ebuild
deleted file mode 100644
index 6e4f504e27..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/xextproto-7.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xextproto/xextproto-7.2.0.ebuild,v 1.3 2011/03/16 16:14:15 scarabeus Exp $
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org XExt protocol headers"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXext-1.0.99"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	CONFIGURE_OPTIONS="
-		$(use_with doc xmlto)
-		--without-fop
-	"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/Manifest
deleted file mode 100644
index 45dd8aade0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST rxvt-unicode-9.07.tar.bz2 858616 RMD160 e20d30eac61bc56deac9da11b4d049fbac3f3b66 SHA1 0e623daa15c45ba3add622277d32493a97059619 SHA256 c5a0638ca8249968065076a6f17e6e499f31fdc9050f71aae4ea85cac6aac5a3
-DIST rxvt-unicode-9.10.tar.bz2 884501 RMD160 15c9f61e7c6ad3f05c6bf20bedad2cd8d5f1d5e9 SHA1 54c896a4885b8984b0dfa652269c3c34c4d75f2d SHA256 1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch
deleted file mode 100644
index 972adbe068..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-While setting MWM_HINTS_DECORATIONS to disable window decorations
-seems to work with most window managers, using _MOTIF_WM_INFO seems
-not to, and in some cases can lead to severe problems with focus
-management. Therefore this patch here disables the _MOTIF_WM_INFO
-check and always attempts to have the window manager honour the
-decorations hint.
-
-If your window manager does not honour MWM_HINTS_DECORATIONS, and you
-are determined that you want to have borderless windows nevertheless,
-you are still free to enable override-redirect manually, using the
-corresponding command line option or X resource.
-
-See also: http://bugs.gentoo.org/show_bug.cgi?id=237271
-2008-09-10 Martin von Gagern
-
-Index: src/init.C
-===================================================================
-RCS file: /schmorpforge/rxvt-unicode/src/init.C,v
-retrieving revision 1.253
-diff -u -r1.253 init.C
---- src/init.C	15 Jul 2008 16:41:22 -0000	1.253
-+++ src/init.C	10 Sep 2008 08:07:09 -0000
-@@ -1078,15 +1078,7 @@
- #if ENABLE_FRILLS
-   if (option (Opt_borderLess))
-     {
--      if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
--        {
--          // rxvt_warn("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");
--          attributes.override_redirect = true;
--        }
--      else
--        {
-           mwmhints.flags = MWM_HINTS_DECORATIONS;
--        }
-     }
- #endif
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch
deleted file mode 100644
index 659ea20cf2..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/rxvtfont.C.orig	2008-07-09 12:21:45.000000000 +0400
-+++ src/rxvtfont.C	2009-10-30 14:32:53.000000000 +0300
-@@ -1195,12 +1195,14 @@
-           XGlyphInfo g;
-           XftTextExtents16 (disp, f, &ch, 1, &g);
- 
--          g.width -= g.x;
--
-+/*  
-+ * bukind: don't use g.width as a width of a character!
-+ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial
-+ */
-           int wcw = WCWIDTH (ch);
--          if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
-+          if (wcw > 1) g.xOff = g.xOff / wcw;
-+          if (width < g.xOff) width = g.xOff;
- 
--          if (width    < g.width       ) width    = g.width;
-           if (height   < g.height      ) height   = g.height;
-           if (glheight < g.height - g.y) glheight = g.height - g.y;
-         }
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff
deleted file mode 100644
index 81a3646d48..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NrU5 rxvt-unicode-9.06.original/src/screen.C rxvt-unicode-9.06/src/screen.C
---- rxvt-unicode-9.06.original/src/screen.C	2009-10-25 18:16:16.000000000 -0600
-+++ rxvt-unicode-9.06/src/screen.C	2009-10-25 18:17:53.000000000 -0600
-@@ -1927,11 +1927,11 @@
- #  endif
-     XMapWindow (dpy, parent[0]);
- # endif
- 
- # if ENABLE_FRILLS
--  if (option (Opt_urgentOnBell))
-+  if (option (Opt_urgentOnBell) && !focus)
-     set_urgency (1);
- # endif
- 
-   if (option (Opt_visualBell))
-     {
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch
deleted file mode 100644
index b09ad99340..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/rxvtperl.xs
-===================================================================
-RCS file: /schmorpforge/rxvt-unicode/src/rxvtperl.xs,v
-retrieving revision 1.127
-diff -u -r1.127 rxvtperl.xs
---- src/rxvtperl.xs	30 May 2009 08:51:23 -0000	1.127
-+++ src/rxvtperl.xs	30 Jul 2009 22:19:33 -0000
-@@ -929,7 +929,9 @@
- rxvt_term::grab (Time eventtime, int sync = 0)
- 	CODE:
- {
--        int mode = sync ? GrabModeSync : GrabModeAsync;
-+        // TA:  20090730:  Always assume Async mode here -- recent Xorg
-+        // Servers don't appreciate being put in Sync mode.
-+        int mode = GrabModeAsync;
- 
-         THIS->perl.grabtime = 0;
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild
deleted file mode 100644
index 414f81c9b7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild,v 1.1 2010/02/03 05:07:45 jer Exp $
-
-EAPI="2"
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="rxvt clone with xft and unicode support"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-SRC_URI="http://dist.schmorp.de/rxvt-unicode/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla"
-
-# see bug #115992 for modular x deps
-RDEPEND="x11-libs/libX11
-	x11-libs/libXft
-	afterimage? ( media-libs/libafterimage )
-	x11-libs/libXrender
-	perl? ( dev-lang/perl )
-	>=sys-libs/ncurses-5.7-r3"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
-
-src_prepare() {
-	if { use xterm-color || use wcwidth; }; then
-		ewarn "You enabled xterm-color or wcwidth or both."
-		ewarn "Please note that neither of them are supported by upstream."
-		ewarn "You are at your own if you run into problems."
-		ebeep 5
-	fi
-
-	local tdir=/usr/share/terminfo
-	if use xterm-color; then
-		epatch doc/urxvt-8.2-256color.patch
-		sed -e \
-			's/^\(rxvt-unicode\)/\1256/;s/colors#88/colors#256/;s/pairs#256/pairs#32767/' \
-			doc/etc/rxvt-unicode.terminfo > doc/etc/rxvt-unicode256.terminfo
-		sed -i -e \
-			"s~^\(\s\+@TIC@.*\)~\1\n\t@TIC@ -o "${D}"/${tdir} \$(srcdir)/etc/rxvt-unicode256.terminfo~" \
-			doc/Makefile.in
-	fi
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in ||
-		die "sed failed"
-
-	use wcwidth && epatch doc/wcwidth.patch
-
-	# bug #240165
-	epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
-
-	# ncurses will provide rxvt-unicode terminfo, so we don't install them again
-	# see bug #192083
-	#
-	# According to my tests this is not (yet?) true, so keep it prepared and
-	# disabled  until it's needed again.
-	#if has_version '<sys-libs/ncurses-5.7'; then
-	sed -i -e \
-		"s~@TIC@ \(\$(srcdir)/etc/rxvt\)~@TIC@ -o "${D}"/${tdir} \1~" \
-		doc/Makefile.in
-	#else
-	#	# Remove everything except if we have rxvt-unicode256
-	#	sed -i -e \
-	#		'/rxvt-unicode256/p;/@TIC@/d' \
-	#		doc/Makefile.in
-	#fi
-
-	# bug #263638
-	epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
-
-	# bug #237271
-	if ! use vanilla; then
-		ewarn "You are going to include third-party bug fixes/features."
-		ewarn "They came without any warranty and are not supported by the"
-		ewarn "Gentoo community."
-		ebeep 5
-		epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
-		epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=''
-
-	use iso14755 || myconf='--disable-iso14755'
-	use xterm-color && myconf="$myconf --enable-xterm-colors=256"
-
-	econf \
-		$(use_enable truetype xft) \
-		$(use_enable afterimage) \
-		$(use_enable perl) \
-		--disable-text-blink \
-		--enable-font-styles \
-		--disable-pixbuf \
-		--disable-transparency \
-		--disable-fading \
-		--disable-utmp \
-		--disable-wtmp \
-		--disable-next-scroll \
-		--disable-xterm-scroll \
-		--disable-smart-resize \
-		--with-x \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	sed -i \
-		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
-}
-
-src_install() {
-	if use minimal; then
-		# Default installation has urxvtc/urxvtd which are rarely used
-		newbin src/rxvt urxvt || die
-		return
-	fi
-
-	make DESTDIR="${D}" install || die
-
-	dodoc README.FAQ Changes
-	cd "${S}"/doc
-	dodoc README* changes.txt etc/* rxvt-tabbed
-}
-
-pkg_postinst() {
-	einfo "urxvt now always uses TERM=rxvt-unicode so that the"
-	einfo "upstream-supplied terminfo files can be used."
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.10.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.10.ebuild
deleted file mode 120000
index 0588b8bcfa..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.10.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-rxvt-unicode-9.07-r1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/xterm/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-terms/xterm/Manifest
deleted file mode 100644
index 1c8f05cfec..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-terms/xterm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xterm-255.tgz 909928 RMD160 13519cebc0870e1bf8815bdf8a4bfaf42684a467 SHA1 09bd7afe42afd14e36b5467bc2e8b6bdb86102e0 SHA256 75d5eecd05093eef94dc0912f461bbcd7a706dedfefddc2998136a064c14284a
diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/xterm/xterm-255.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-terms/xterm/xterm-255.ebuild
deleted file mode 100644
index 5bfa4df951..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/x11-terms/xterm/xterm-255.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-255.ebuild,v 1.1 2010/01/24 17:39:18 ssuominen Exp $
-
-EAPI=2
-inherit multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="http://dickey.his.com/xterm/"
-SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="-toolbar +truetype +unicode -Xaw3d"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libxkbfile
-	x11-libs/libXft
-	x11-libs/libXaw
-	x11-apps/xmessage
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/Xaw3d )
-        "
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto"
-
-pkg_setup() {
-	DEFAULTS_DIR=/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	econf \
-		--libdir=/etc \
-		--x-libraries="${ROOT}usr/$(get_libdir)" \
-		--disable-full-tgetent \
-		--with-app-defaults=${DEFAULTS_DIR} \
-		--disable-setuid \
-		--disable-setgid \
-		--without-utempter \
-		--with-x \
-		$(use_with Xaw3d) \
-		--disable-imake \
-		--enable-256-color \
-		--enable-broken-osc \
-		--enable-broken-st \
-		$(use_enable truetype freetype) \
-		--enable-i18n \
-		--enable-load-vt-fonts \
-		--disable-logging \
-		$(use_enable toolbar) \
-		$(use_enable unicode mini-luit) \
-		$(use_enable unicode luit) \
-		--enable-wide-chars \
-		--enable-dabbrev \
-		--disable-desktop \
-		--without-neXtaw \
-		--without-XawPlus \
-		--enable-88-color \
-		--disable-rightbar \
-		--enable-warnings
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README{,.i18n} ctlseqs.txt
-	dohtml xterm.log.html
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e "s:blue2$:blue:" "${D}"${DEFAULTS_DIR}/XTerm-color
-}