diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
deleted file mode 100644
index 79ead43ed..000000000
--- a/x11-libs/xcb-util-image/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xcb-util-image-0.3.9.tar.bz2 310947 SHA256 d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df SHA512 6cf7e191f3814528d977aa2acb2a106aaba0732c5d5f4041ac39039e18b9064f90f96da087300f4061d700e3521648e5540117794fdc41dad36ca5f973370394 WHIRLPOOL 6848c12e1f98a4989c8ae2f6765de99639aef178c28f5d782eca132e0ea7adf32aecbd1da0b2631213898a2315dec71beacb8a4dfc717d3701d6500e70092828
diff --git a/x11-libs/xcb-util-image/metadata.xml b/x11-libs/xcb-util-image/metadata.xml
deleted file mode 100644
index 01c4c004e..000000000
--- a/x11-libs/xcb-util-image/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild
deleted file mode 100644
index d6f174873..000000000
--- a/x11-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-image"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="http://xcb.freedesktop.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
-	x11-proto/xproto[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.4 )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
deleted file mode 100644
index 107bb13b6..000000000
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xcb-util-keysyms-0.3.9.tar.bz2 286075 SHA256 7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e SHA512 0c7f9afea5886145760ff055fa9d38ac886306bca926b00c0c7da770b5e9a941887383922b144441d82fd071784cf94334773eae39b59aee094d570778f8f8f8 WHIRLPOOL fea0109e7e61af17170cf8da8a6c521d61f3354b40e16ea78fe2668df0afad551745caf84059db463fd4b7ee75d4d5795007d3a7268922da9bb7974753e4c33e
diff --git a/x11-libs/xcb-util-keysyms/metadata.xml b/x11-libs/xcb-util-keysyms/metadata.xml
deleted file mode 100644
index 01c4c004e..000000000
--- a/x11-libs/xcb-util-keysyms/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild
deleted file mode 100644
index 548985cac..000000000
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-keysyms"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="http://xcb.freedesktop.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
-	x11-proto/xproto[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.4 )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
deleted file mode 100644
index 5f3cf9a3a..000000000
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xcb-util-renderutil-0.3.8.tar.bz2 257492 SHA256 9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452 SHA512 d2f94d23628383a1d2c861e0bfbe6452b89efd1003348dcfacfae9249b49fefb91efdec4cd5f5fc0aadd6f6b72cb2b866089e42b5006f9394fb6b68cb484fa8e WHIRLPOOL 7ef258498c1ca3ebe16e4505f9fe280c4abe72ee04b012842cfb624edb622f611c3843ff5de52a7a455401ec352e02a432d60ab2829654bbe98b2b6450a907b6
diff --git a/x11-libs/xcb-util-renderutil/metadata.xml b/x11-libs/xcb-util-renderutil/metadata.xml
deleted file mode 100644
index 01c4c004e..000000000
--- a/x11-libs/xcb-util-renderutil/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8-r1.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8-r1.ebuild
deleted file mode 100644
index e51e0e3f5..000000000
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-renderutil"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="http://xcb.freedesktop.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
-	x11-proto/xproto[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.4 )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
deleted file mode 100644
index f17a18367..000000000
--- a/x11-libs/xcb-util-wm/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST xcb-util-wm-0.3.9.tar.bz2 320472 SHA256 038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030 SHA512 69f5840a8c27ae56f454962476bc246b56b3520562e26d31dae8388050abe3ebf9d1bcea512f830eaf63887b12df685a0f14c5c4cc963c3605330de29dcee0f1 WHIRLPOOL 4f6c3e0f51cd84272191d3a6a71517125e5e131ddfe367c7330fe23448f9e939fdaa565ad37fa92014635b07ef303a08f56fe5ece669c202301fe743f114e288
-DIST xcb-util-wm-0.4.0.tar.bz2 324316 SHA256 66f97c18f7d98d3c873fe5db5842d2fca34519274c31ee668551ab8995a2f51f SHA512 b0b209ca75b022bb2475f7fbc5cddbeb8a07b0e42b7cd9b302b8456e2f5df802920c48cb89799d738f27580ee89245a06534b7eb1823ede7599f86d10cf6abc4 WHIRLPOOL 5ce3d1167500ecb73b278ba9674429da0fdc26bb709ff796738ce1f18f4f1e4c73f0e3d51ce4003015ba42e8b843ce7fa0fba2b7576d9829632f149335fc389c
diff --git a/x11-libs/xcb-util-wm/metadata.xml b/x11-libs/xcb-util-wm/metadata.xml
deleted file mode 100644
index 01c4c004e..000000000
--- a/x11-libs/xcb-util-wm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.3.9-r1.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.3.9-r1.ebuild
deleted file mode 100644
index 405a7b8ee..000000000
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.3.9-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-wm"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="http://xcb.freedesktop.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
-	x11-proto/xcb-proto[${MULTILIB_USEDEP}]
-	x11-proto/xproto[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.4 )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.0.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.0.ebuild
deleted file mode 100644
index e07f9f80b..000000000
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-wm"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="http://xcb.freedesktop.org/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/xcb-util-0.3.9[${MULTILIB_USEDEP}]
-	x11-proto/xcb-proto[${MULTILIB_USEDEP}]
-	x11-proto/xproto[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.4 )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
deleted file mode 100644
index 7a4ab94df..000000000
--- a/x11-libs/xcb-util/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xcb-util-0.3.9.tar.bz2 287855 SHA256 c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4 SHA512 3cf2e1da2c8099e66e7200e074f31d0c5913533382bceeedb663aab3ef2571533271218a17ad638db26b8ab9be41743e4665e1db8f85c85b1a42890329e1254a WHIRLPOOL 75dbd708103fc775f9bbd21f8e408a205d298389f6232b810e026a87a75580c90529a88a54d6453b79b21b7aa7c17c00473870fd7721d7337af3b262ca83a13c
diff --git a/x11-libs/xcb-util/metadata.xml b/x11-libs/xcb-util/metadata.xml
deleted file mode 100644
index 01c4c004e..000000000
--- a/x11-libs/xcb-util/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-libs/xcb-util/xcb-util-0.3.9-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.3.9-r1.ebuild
deleted file mode 100644
index a4407759c..000000000
--- a/x11-libs/xcb-util/xcb-util-0.3.9-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/xcb-util-0.3.9.ebuild,v 1.9 2013/02/23 02:45:25 zmedico Exp $
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="http://xcb.freedesktop.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/libxcb-1.7[${MULTILIB_USEDEP}]
-	x11-proto/xproto[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.4 )"
-
-PDEPEND="
-	>=x11-libs/xcb-util-image-${PV}[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-keysyms-${PV}[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.8[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-wm-${PV}[${MULTILIB_USEDEP}]
-"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_pkg_setup
-}