Remove unmaintained cruft

Lots of xorg-2 / EAPI=5 stuff.

Signed-off-by: Matt Turner <mattst88@gentoo.org>

133 files changed, 0 insertions, 2634 deletions

diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
deleted file mode 100644
index 8554fcc1..00000000
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-XORG_MULTILIB=yes
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit python-any-r1 xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
-
-DESCRIPTION="Handler library for evdev events"
-
-if [[ ${PV} == 9999* ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-fi
-
-RESTRICT="test" # Tests need to run as root.
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
diff --git a/dev-libs/libevdev/metadata.xml b/dev-libs/libevdev/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/dev-libs/libevdev/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/profiles/package.mask b/profiles/package.mask
deleted file mode 100644
index 1448f4f3..00000000
--- a/profiles/package.mask
+++ /dev/null
@@ -1,77 +0,0 @@
-# Don't let people install these accidentally
-=dev-libs/libevdev-9999
-=x11-apps/mkfontdir-9999
-=x11-apps/mkfontscale-9999
-=x11-apps/smproxy-9999
-=x11-apps/x11perf-9999
-=x11-apps/xcursorgen-9999
-=x11-apps/xdriinfo-9999
-=x11-apps/xev-9999
-=x11-apps/xinit-9999
-=x11-apps/xinput-9999
-=x11-apps/xkbevd-9999
-=x11-apps/xkbutils-9999
-=x11-apps/xman-9999
-=x11-apps/xrandr-9999
-=x11-apps/xwininfo-9999
-=x11-drivers/xf86-input-evdev-9999
-=x11-drivers/xf86-input-joystick-9999
-=x11-drivers/xf86-input-keyboard-9999
-=x11-drivers/xf86-input-mouse-9999
-=x11-drivers/xf86-input-synaptics-9999
-=x11-drivers/xf86-input-wacom-9999
-=x11-drivers/xf86-video-glint-9999
-=x11-drivers/xf86-video-nouveau-9999
-=x11-drivers/xf86-video-vmware-9999
-=x11-libs/libdmx-9999
-=x11-libs/libfontenc-9999
-=x11-libs/libFS-9999
-=x11-libs/libICE-9999
-=x11-libs/libpciaccess-9999
-=x11-libs/libSM-9999
-=x11-libs/libvdpau-va-gl-9999
-=x11-libs/libX11-9999
-=x11-libs/libXamine-9999
-=x11-libs/libXau-9999
-=x11-libs/libXaw3d-9999
-=x11-libs/libXaw-9999
-=x11-libs/libxcb-9999
-=x11-libs/libXcomposite-9999
-=x11-libs/libXcursor-9999
-=x11-libs/libXdamage-9999
-=x11-libs/libXdmcp-9999
-=x11-libs/libXext-9999
-=x11-libs/libXfixes-9999
-=x11-libs/libXft-9999
-=x11-libs/libXi-9999
-=x11-libs/libXinerama-9999
-=x11-libs/libxkbcommon-9999
-=x11-libs/libxkbfile-9999
-=x11-libs/libxkbui-9999
-=x11-libs/libXmu-9999
-=x11-libs/libXpm-9999
-=x11-libs/libXrandr-9999
-=x11-libs/libXrender-9999
-=x11-libs/libXres-9999
-=x11-libs/libXScrnSaver-9999
-=x11-libs/libxshmfence-9999
-=x11-libs/libXt-9999
-=x11-libs/libXTrap-9999
-=x11-libs/libXtst-9999
-=x11-libs/libXv-9999
-=x11-libs/libXvMC-9999
-=x11-libs/libXxf86dga-9999
-=x11-libs/libXxf86misc-9999
-=x11-libs/libXxf86vm-9999
-=x11-libs/startup-notification-9999
-=x11-libs/xcb-util-9999
-=x11-libs/xcb-util-cursor-9999
-=x11-libs/xcb-util-image-9999
-=x11-libs/xcb-util-keysyms-9999
-=x11-libs/xcb-util-renderutil-9999
-=x11-libs/xcb-util-wm-9999
-=x11-libs/xtrans-9999
-=x11-misc/envytools-9999
-=x11-misc/util-macros-9999
-=x11-misc/xcb-demo-9999
-=x11-misc/xkeyboard-config-9999
diff --git a/profiles/updates/1Q-2012 b/profiles/updates/1Q-2012
deleted file mode 100644
index 41e2576e..00000000
--- a/profiles/updates/1Q-2012
+++ /dev/null
@@ -1 +0,0 @@
-move x11-base/wayland dev-libs/wayland
diff --git a/x11-apps/mkfontdir/mkfontdir-9999.ebuild b/x11-apps/mkfontdir/mkfontdir-9999.ebuild
deleted file mode 100644
index 40494f03..00000000
--- a/x11-apps/mkfontdir/mkfontdir-9999.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="create an index of X font files in a directory"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-apps/mkfontscale"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontscale/metadata.xml b/x11-apps/mkfontscale/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-apps/mkfontscale/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-apps/mkfontscale/mkfontscale-9999.ebuild b/x11-apps/mkfontscale/mkfontscale-9999.ebuild
deleted file mode 100644
index 8695728a..00000000
--- a/x11-apps/mkfontscale/mkfontscale-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libfontenc
-	media-libs/freetype:2
-	sys-libs/zlib
-	app-arch/bzip2"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	app-arch/gzip"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/smproxy/smproxy-9999.ebuild b/x11-apps/smproxy/smproxy-9999.ebuild
deleted file mode 100644
index 253a46e5..00000000
--- a/x11-apps/smproxy/smproxy-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Session Manager Proxy"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libXt
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/x11perf/x11perf-9999.ebuild b/x11-apps/x11perf/x11perf-9999.ebuild
deleted file mode 100644
index 35932924..00000000
--- a/x11-apps/x11perf/x11perf-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X rendering operation stress test utility"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXft
-	x11-libs/libXrender
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcursorgen/xcursorgen-9999.ebuild b/x11-apps/xcursorgen/xcursorgen-9999.ebuild
deleted file mode 100644
index 244259de..00000000
--- a/x11-apps/xcursorgen/xcursorgen-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="create an X cursor file from a collection of PNG images"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXcursor
-	media-libs/libpng:0"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xdriinfo/metadata.xml b/x11-apps/xdriinfo/metadata.xml
deleted file mode 100644
index 9d01a7bb..00000000
--- a/x11-apps/xdriinfo/metadata.xml
+++ /dev/null
@@ -1,6 +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-apps/xdriinfo/xdriinfo-9999.ebuild b/x11-apps/xdriinfo/xdriinfo-9999.ebuild
deleted file mode 100644
index f2f29b58..00000000
--- a/x11-apps/xdriinfo/xdriinfo-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="query configuration information of DRI drivers"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	x11-proto/glproto"
-
-src_configure() {
-	append-cppflags "-I${EPREFIX}/usr/lib64/opengl/xorg-x11/include/"
-	xorg-2_src_configure
-}
diff --git a/x11-apps/xev/xev-9999.ebuild b/x11-apps/xev/xev-9999.ebuild
deleted file mode 100644
index ae060097..00000000
--- a/x11-apps/xev/xev-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="print contents of X events"
-
-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 ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
diff --git a/x11-apps/xinit/files/00-xhost b/x11-apps/xinit/files/00-xhost
deleted file mode 100644
index 82cf1038..00000000
--- a/x11-apps/xinit/files/00-xhost
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Allow all local connections from the current UID
-# This fixes issues with hostname changes (usually by dhcp clients)
-# see bug 287498 for more info
-
-[ -x /usr/bin/xhost ] && [ -x /usr/bin/id ] &&
-	xhost +si:localuser:`id -un` > /dev/null 2>&1
diff --git a/x11-apps/xinit/files/Xsession b/x11-apps/xinit/files/Xsession
deleted file mode 100755
index c86ccee1..00000000
--- a/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/x11-apps/xinit/files/Xsession.desktop b/x11-apps/xinit/files/Xsession.desktop
deleted file mode 100644
index 4ed3a5cd..00000000
--- a/x11-apps/xinit/files/Xsession.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=XSession
-Comment=This session logs you into your custom Xsession
-Exec=/etc/X11/Sessions/Xsession
-TryExec=/etc/X11/Sessions/Xsession
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/x11-apps/xinit/files/chooser.sh b/x11-apps/xinit/files/chooser.sh
deleted file mode 100755
index 13bfc2e3..00000000
--- a/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.4 2006/09/05 23:22:13 dberkholz 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/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
deleted file mode 100755
index ebb79704..00000000
--- a/x11-apps/xinit/files/startDM.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2011 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.5 2011/01/22 15:35:49 lxnay 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_ARGS="$(get_options start_stop_args)"
-
-start-stop-daemon --start --exec ${EXEC} \
-${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \
-eerror "ERROR: could not start the Display Manager"
-
-# vim:ts=4
diff --git a/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
deleted file mode 100644
index 48dceabc..00000000
--- a/x11-apps/xinit/files/xinit-1.3.3-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.d/?*.sh ; do
-+	for f in XINITDIR/xinitrc.d/?* ; 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/x11-apps/xinit/files/xserverrc.1 b/x11-apps/xinit/files/xserverrc.1
deleted file mode 100755
index 6b57eeba..00000000
--- a/x11-apps/xinit/files/xserverrc.1
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ -z "$XDG_VTNR" ]; then
-  exec /usr/bin/X -nolisten tcp "$@"
-else
-  exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
-fi
diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
deleted file mode 100644
index 8f15b004..00000000
--- a/x11-apps/xinit/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>x11</herd>
-	<use>
-		<flag name='minimal'>
-			Control dependencies on legacy apps (xterm, twm, ...). Safe to
-			enable if you use a modern desktop environment.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild
deleted file mode 100644
index 07a23653..00000000
--- a/x11-apps/xinit/xinit-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-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}/${PN}-1.3.3-gentoo-customizations.patch"
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xinitdir=/etc/X11/xinit
-	)
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/Xsession
-	exeinto /etc/X11/xinit
-	newexe "${FILESDIR}"/xserverrc.1 xserverrc
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/00-xhost"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/Xsession.desktop"
-}
-
-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/x11-apps/xinput/metadata.xml b/x11-apps/xinput/metadata.xml
deleted file mode 100644
index 6cc39824..00000000
--- a/x11-apps/xinput/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-apps/xinput/xinput-9999.ebuild b/x11-apps/xinput/xinput-9999.ebuild
deleted file mode 100644
index 56e41f55..00000000
--- a/x11-apps/xinput/xinput-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Utility to set XInput device parameters"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.3
-	x11-libs/libXext
-	>=x11-libs/libXi-1.5.99.1
-	x11-libs/libXinerama
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.1.99.1"
diff --git a/x11-apps/xkbevd/xkbevd-9999.ebuild b/x11-apps/xkbevd/xkbevd-9999.ebuild
deleted file mode 100644
index fc4255d8..00000000
--- a/x11-apps/xkbevd/xkbevd-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="XKB event daemon"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
diff --git a/x11-apps/xkbutils/xkbutils-9999.ebuild b/x11-apps/xkbutils/xkbutils-9999.ebuild
deleted file mode 100644
index d7bc3ec2..00000000
--- a/x11-apps/xkbutils/xkbutils-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xkbutils application"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/inputproto"
diff --git a/x11-apps/xman/xman-9999.ebuild b/x11-apps/xman/xman-9999.ebuild
deleted file mode 100644
index 3b6338b4..00000000
--- a/x11-apps/xman/xman-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Manual page display program for the X Window System"
-
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrandr/metadata.xml b/x11-apps/xrandr/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-apps/xrandr/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-apps/xrandr/xrandr-9999.ebuild b/x11-apps/xrandr/xrandr-9999.ebuild
deleted file mode 100644
index fc5ecdd4..00000000
--- a/x11-apps/xrandr/xrandr-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="primitive command line interface to RandR extension"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrandr-1.4
-	x11-libs/libXrender
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	xorg-2_src_install
-	rm -f "${ED}"/usr/bin/xkeystone || die
-}
diff --git a/x11-apps/xwininfo/metadata.xml b/x11-apps/xwininfo/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-apps/xwininfo/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-apps/xwininfo/xwininfo-9999.ebuild b/x11-apps/xwininfo/xwininfo-9999.ebuild
deleted file mode 100644
index 9cb0c536..00000000
--- a/x11-apps/xwininfo/xwininfo-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="window information utility for X"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libxcb-1.6"
-DEPEND="${RDEPEND}
-	x11-libs/libX11
-	>=x11-proto/xproto-7.0.17"
-
-src_configure() {
-	# interix has a _very_ old iconv in libc, however, including
-	# iconv.h redefines those symbols to libiconv_*, which then
-	# are unresolved, as the configure check is old and dumb.
-	[[ ${CHOST} == *-interix* ]] &&
-		append-libs -liconv
-	xorg-2_src_configure
-}
diff --git a/x11-drivers/xf86-input-evdev/metadata.xml b/x11-drivers/xf86-input-evdev/metadata.xml
deleted file mode 100644
index b79ed438..00000000
--- a/x11-drivers/xf86-input-evdev/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
-<herd>x11-drivers</herd>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild
deleted file mode 100644
index bc2ab590..00000000
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit linux-info 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.12[udev]
-	dev-libs/libevdev
-	sys-libs/mtdev"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.1.99.3
-	>=sys-kernel/linux-headers-2.6"
-
-pkg_pretend() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INPUT_EVDEV"
-	fi
-	check_extra_config
-}
diff --git a/x11-drivers/xf86-input-joystick/metadata.xml b/x11-drivers/xf86-input-joystick/metadata.xml
deleted file mode 100644
index b79ed438..00000000
--- a/x11-drivers/xf86-input-joystick/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
-<herd>x11-drivers</herd>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild
deleted file mode 100644
index 8d431d6c..00000000
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for joystick input devices"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.10"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-input-keyboard/metadata.xml b/x11-drivers/xf86-input-keyboard/metadata.xml
deleted file mode 100644
index b79ed438..00000000
--- a/x11-drivers/xf86-input-keyboard/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
-<herd>x11-drivers</herd>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild
deleted file mode 100644
index 22a625be..00000000
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Keyboard input driver"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.6.3"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-input-mouse/metadata.xml b/x11-drivers/xf86-input-mouse/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-drivers/xf86-input-mouse/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-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild
deleted file mode 100644
index f464d800..00000000
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for mouse input devices"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.7"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-input-plpevtch/Manifest b/x11-drivers/xf86-input-plpevtch/Manifest
deleted file mode 100644
index a3d95577..00000000
--- a/x11-drivers/xf86-input-plpevtch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xf86-input-plpevtch-0.5.0.tar.gz 360463 SHA256 8ab71d4e19e8634358593b3122a7e9f43f1a6f4502881f9b6184b2eaf4bf2df8
diff --git a/x11-drivers/xf86-input-plpevtch/xf86-input-plpevtch-0.5.0.ebuild b/x11-drivers/xf86-input-plpevtch/xf86-input-plpevtch-0.5.0.ebuild
deleted file mode 100644
index 9001db3b..00000000
--- a/x11-drivers/xf86-input-plpevtch/xf86-input-plpevtch-0.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Evdev based touchscreen driver"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-HOMEPAGE="http://www.plop.at/en/touchscreen.html"
-SRC_URI="http://download.plop.at/files/plpevtch/${P}.tar.gz"
-
-IUSE=""
-
-RDEPEND="x11-base/xorg-server"
-DEPEND="${RDEPEND}
-	x11-drivers/xf86-input-evdev
-	x11-proto/xproto"
-
-src_install() {
-	xorg-2_src_install
-	# file collision with evdev
-	rm "${D}"/usr/include/xorg/evdev-properties.h || die
-}
diff --git a/x11-drivers/xf86-input-synaptics/metadata.xml b/x11-drivers/xf86-input-synaptics/metadata.xml
deleted file mode 100644
index 55970b5c..00000000
--- a/x11-drivers/xf86-input-synaptics/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>eva@gentoo.org</email>
-		<name>Gilles Dartiguelongue</name>
-	</maintainer>
-	<maintainer>
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
-	<maintainer>
-		<email>egore@gmx.de</email>
-		<name>Christoph Brill</name>
-		<description>upstream co-maintainer</description>
-	</maintainer>
-	<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
deleted file mode 100644
index 4183d483..00000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit linux-info xorg-2
-
-DESCRIPTION="Driver for Synaptics touchpads"
-HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
-
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="kernel_linux"
-
-RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
-	>=x11-base/xorg-server-1.12
-	>=x11-libs/libXi-1.2
-	>=x11-libs/libXtst-1.1.0"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.37
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/recordproto-1.14"
-
-DOCS=( "README" )
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	# Just a friendly warning
-	if ! linux_config_exists \
-			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		echo
-		ewarn "This driver requires event interface support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>     Event interface"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-input-wacom/metadata.xml b/x11-drivers/xf86-input-wacom/metadata.xml
deleted file mode 100644
index 6640ee55..00000000
--- a/x11-drivers/xf86-input-wacom/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>x11</herd>
-  <maintainer>
-    <email>ikelos@gentoo.org</email>
-    <name>Mike Auty</name>
-  </maintainer>
-  <longdescription>Driver for Wacom tablets and drawing devices (friendly fork of linuxwacom)</longdescription>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild
deleted file mode 100644
index 15159066..00000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit linux-info xorg-2
-
-DESCRIPTION="Driver for Wacom tablets and drawing devices"
-HOMEPAGE="http://linuxwacom.sourceforge.net/"
-LICENSE="GPL-2"
-EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libwacom
-	virtual/udev
-	>=x11-base/xorg-server-1.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-	)
-}
-
-src_install() {
-	xorg-2_src_install
-
-	rm -rf "${ED}"/usr/share/hal
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	if ! linux_config_exists \
-			|| ! linux_chkconfig_present TABLET_USB_WACOM \
-			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		echo
-		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>   Event interface"
-		ewarn "      [*]   Tablets  --->"
-		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-9999.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-9999.ebuild
deleted file mode 100644
index 6e9ad73b..00000000
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="GLINT/Permedia video driver"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-nouveau/metadata.xml b/x11-drivers/xf86-video-nouveau/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-drivers/xf86-video-nouveau/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-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
deleted file mode 100644
index 0f4c0435..00000000
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-XORG_DRI="always"
-inherit linux-info xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/nouveau/${PN}"
-
-DESCRIPTION="Accelerated Open Source driver for nVidia cards"
-HOMEPAGE="http://nouveau.freedesktop.org/"
-SRC_URI=""
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild
deleted file mode 100644
index 80410ab9..00000000
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="VMware SVGA video driver"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]
-	media-libs/mesa[xa]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libFS/libFS-9999.ebuild b/x11-libs/libFS/libFS-9999.ebuild
deleted file mode 100644
index 293b93d4..00000000
--- a/x11-libs/libFS/libFS-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org FS library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/xtrans
-	x11-proto/xproto
-	x11-proto/fontsproto"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libFS/metadata.xml b/x11-libs/libFS/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libFS/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/libICE/libICE-9999.ebuild b/x11-libs/libICE/libICE-9999.ebuild
deleted file mode 100644
index be26bbac..00000000
--- a/x11-libs/libICE/libICE-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org ICE library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~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="ipv6"
-
-RDEPEND="x11-libs/xtrans
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libICE/metadata.xml b/x11-libs/libICE/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libICE/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/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
deleted file mode 100644
index 69826974..00000000
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org SM library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc ipv6 +uuid"
-
-RDEPEND=">=x11-libs/libICE-1.0.8-r1:=[${MULTILIB_USEDEP}]
-	x11-libs/xtrans
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
-		uuid? ( >=sys-apps/util-linux-2.24.1-r3:=[${MULTILIB_USEDEP}] )
-	) ) )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local withuuid=$(use_with uuid libuuid)
-
-	# do not use uuid even if available in libc (like on FreeBSD)
-	use uuid || export ac_cv_func_uuid_create=no
-
-	if use uuid ; then
-		case ${CHOST} in
-			*-solaris*|*-darwin*)
-				if [[ ! -d ${EROOT}usr/include/uuid ]] &&
-					[[ -d ${ROOT}usr/include/uuid ]]
-				then
-					# Solaris and Darwin have uuid provided by the host
-					# system.  Since util-linux's version is based on this
-					# version, and on Darwin actually breaks host headers when
-					# installed, we can "pretend" for libSM we have libuuid
-					# installed, while in fact we don't
-					withuuid="--without-libuuid"
-					export HAVE_LIBUUID=yes
-					export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
-					# Darwin has uuid in libSystem
-					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
-				fi
-				;;
-		esac
-	fi
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		${withuuid}
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml
deleted file mode 100644
index 8b3fa73a..00000000
--- a/x11-libs/libSM/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-<use>
-	<flag name="uuid">Use UUID for session identification instead of IP address
-		and system time.
-	</flag>
-</use>
-</pkgmetadata>
diff --git a/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch b/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
deleted file mode 100644
index c854e0b4..00000000
--- a/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2008-07-21 15:48:33 +0200
-+++ configure.ac	2008-07-21 15:49:23 +0200
-@@ -198,6 +198,8 @@
-         XTHREADLIB="-pthread" ;;
-     solaris*)
- 	XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
-+    aix*)
-+	XTHREAD_CFLAGS="-pthread" ;;
-     esac
- fi
- AC_SUBST(XTHREADLIB)
diff --git a/x11-libs/libX11/files/libX11-1.1.5-solaris.patch b/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
deleted file mode 100644
index a7926a53..00000000
--- a/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-wchar_t is defined in /usr/include/stddef.h on Solaris
-
---- include/X11/Xlib.h
-+++ include/X11/Xlib.h
-@@ -71,7 +71,7 @@
- #endif
- #endif
- 
--#ifndef X_WCHAR
-+#if !defined(X_WCHAR) || defined(__sun__)
- #include <stddef.h>
- #else
- #ifdef __UNIXOS2__
diff --git a/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch b/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
deleted file mode 100644
index 4539f111..00000000
--- a/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' -x '*.o' -x '*.lo' libX11-1.1.5/src/xlibi18n/Ximint.h libX11-1.1.5.orig/src/xlibi18n/Ximint.h
---- libX11-1.1.5/src/xlibi18n/Ximint.h	2009-01-16 10:14:37 +0100
-+++ libX11-1.1.5.orig/src/xlibi18n/Ximint.h	2009-01-16 09:39:48 +0100
-@@ -37,6 +37,9 @@
- 
- #include <stdio.h>
- #include <X11/Xutil.h>
-+#ifdef WIN32
-+# include <X11/Xwindows.h>
-+#endif
- 
- #define Public /**/
- #define Private static
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
deleted file mode 100644
index a646b93c..00000000
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="ipv6 test"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
-	x11-libs/xtrans
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86bigfontproto-1.2.0-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/inputproto-2.3:=[${MULTILIB_USEDEP}]
-	>=x11-proto/kbproto-1.0.6-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch
-	"${FILESDIR}"/${PN}-1.1.5-winnt-private.patch
-	"${FILESDIR}"/${PN}-1.1.5-solaris.patch
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-	)
-
-	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
-	xorg-2_src_configure
-}
-
-multilib_src_compile() {
-	# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
-	if tc-is-cross-compiler; then
-		(
-			filter-flags -m*
-			emake -C src/util \
-			CC=$(tc-getBUILD_CC) \
-			CFLAGS="${CFLAGS}" \
-			LDFLAGS="" \
-			clean all || die
-		)
-	fi
-
-	default
-}
diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libX11/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/libXScrnSaver/libXScrnSaver-9999.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
deleted file mode 100644
index ca798d92..00000000
--- a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/scrnsaverproto-1.2.2-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXTrap/libXTrap-9999.ebuild b/x11-libs/libXTrap/libXTrap-9999.ebuild
deleted file mode 100644
index 032d4c88..00000000
--- a/x11-libs/libXTrap/libXTrap-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org XTrap library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-proto/trapproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXamine/libXamine-9999.ebuild b/x11-libs/libXamine/libXamine-9999.ebuild
deleted file mode 100644
index c68b34d3..00000000
--- a/x11-libs/libXamine/libXamine-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libXamine"
-DESCRIPTION="Protocol analysis library for the X Window System protocol"
-HOMEPAGE="http://xcb.freedesktop.org/"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libxcb"
-DEPEND="${RDEPEND}
-	>=x11-proto/xcb-proto-9999"
diff --git a/x11-libs/libXau/libXau-9999.ebuild b/x11-libs/libXau/libXau-9999.ebuild
deleted file mode 100644
index 2b455995..00000000
--- a/x11-libs/libXau/libXau-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xau library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXaw/libXaw-9999.ebuild b/x11-libs/libXaw/libXaw-9999.ebuild
deleted file mode 100644
index 7fc01f37..00000000
--- a/x11-libs/libXaw/libXaw-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xaw library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="deprecated"
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXpm-3.5.10-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable deprecated xaw6)
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXaw/metadata.xml b/x11-libs/libXaw/metadata.xml
deleted file mode 100644
index f58d351d..00000000
--- a/x11-libs/libXaw/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-<use>
-	<flag name="deprecated">Install deprecated Xaw6 library.</flag>
-</use>
-</pkgmetadata>
diff --git a/x11-libs/libXaw3d/libXaw3d-9999.ebuild b/x11-libs/libXaw3d/libXaw3d-9999.ebuild
deleted file mode 100644
index 2ee63ca2..00000000
--- a/x11-libs/libXaw3d/libXaw3d-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Xaw3d library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="unicode"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable unicode internationalization)
-		--enable-arrow-scrollbars
-		--enable-gray-stipples
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXaw3d/metadata.xml b/x11-libs/libXaw3d/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libXaw3d/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/libXcomposite/libXcomposite-9999.ebuild b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
deleted file mode 100644
index a2bd166a..00000000
--- a/x11-libs/libXcomposite/libXcomposite-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xcomposite library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/compositeproto-0.4.2-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXcomposite/metadata.xml b/x11-libs/libXcomposite/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libXcomposite/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/libXcursor/libXcursor-9999.ebuild b/x11-libs/libXcursor/libXcursor-9999.ebuild
deleted file mode 100644
index 59ff1e83..00000000
--- a/x11-libs/libXcursor/libXcursor-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xcursor library"
-
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrender-0.9.8:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-icondir=/usr/share/cursors/xorg-x11
-	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
-)
diff --git a/x11-libs/libXcursor/metadata.xml b/x11-libs/libXcursor/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libXcursor/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/libXdamage/libXdamage-9999.ebuild b/x11-libs/libXdamage/libXdamage-9999.ebuild
deleted file mode 100644
index 84fb9595..00000000
--- a/x11-libs/libXdamage/libXdamage-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xdamage library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/damageproto-1.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXdmcp/libXdmcp-9999.ebuild b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
deleted file mode 100644
index 4e6497ec..00000000
--- a/x11-libs/libXdmcp/libXdmcp-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xdmcp library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libXdmcp/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/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild
deleted file mode 100644
index b760590a..00000000
--- a/x11-libs/libXext/libXext-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xext library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXext/metadata.xml b/x11-libs/libXext/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libXext/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/libXfixes/libXfixes-9999.ebuild b/x11-libs/libXfixes/libXfixes-9999.ebuild
deleted file mode 100644
index db99117d..00000000
--- a/x11-libs/libXfixes/libXfixes-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xfixes library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/fixesproto-5.0-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXft/libXft-9999.ebuild b/x11-libs/libXft/libXft-9999.ebuild
deleted file mode 100644
index 7e690e45..00000000
--- a/x11-libs/libXft/libXft-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="X.Org Xft library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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.9.8:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:=[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	virtual/ttf-fonts"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXi/libXi-9999.ebuild b/x11-libs/libXi/libXi-9999.ebuild
deleted file mode 100644
index b6901ca8..00000000
--- a/x11-libs/libXi/libXi-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/inputproto-2.3:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		$(use_with doc asciidoc)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
-
-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/x11-libs/libXi/metadata.xml b/x11-libs/libXi/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libXi/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/libXinerama/libXinerama-9999.ebuild b/x11-libs/libXinerama/libXinerama-9999.ebuild
deleted file mode 100644
index b36c87a9..00000000
--- a/x11-libs/libXinerama/libXinerama-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xinerama library"
-
-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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xineramaproto-1.2.1-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXmu/libXmu-9999.ebuild b/x11-libs/libXmu/libXmu-9999.ebuild
deleted file mode 100644
index 515dd7e8..00000000
--- a/x11-libs/libXmu/libXmu-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xmu library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6"
-
-RDEPEND=">=x11-libs/libXt-1.1.4:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXmu/metadata.xml b/x11-libs/libXmu/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libXmu/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/libXpm/libXpm-9999.ebuild b/x11-libs/libXpm/libXpm-9999.ebuild
deleted file mode 100644
index cd70d847..00000000
--- a/x11-libs/libXpm/libXpm-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="X.Org Xpm library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_compile() {
-	# the gettext configure check and code in sxpm are incorrect; they assume
-	# gettext being in libintl, whereas Solaris has gettext by default
-	# resulting in libintl not being added to LIBS
-	[[ ${CHOST} == *-solaris* ]] && append-libs -lintl
-	xorg-2_src_compile
-}
diff --git a/x11-libs/libXrandr/libXrandr-9999.ebuild b/x11-libs/libXrandr/libXrandr-9999.ebuild
deleted file mode 100644
index abd356fb..00000000
--- a/x11-libs/libXrandr/libXrandr-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xrandr library"
-
-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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.8:=[${MULTILIB_USEDEP}]
-	>=x11-proto/randrproto-1.4.0-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/renderproto-0.11.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/libXrender-9999.ebuild b/x11-libs/libXrender/libXrender-9999.ebuild
deleted file mode 100644
index 27f43511..00000000
--- a/x11-libs/libXrender/libXrender-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xrender library"
-
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/renderproto-0.11.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXres/libXres-9999.ebuild b/x11-libs/libXres/libXres-9999.ebuild
deleted file mode 100644
index 0ee0104a..00000000
--- a/x11-libs/libXres/libXres-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/libXRes"
-DESCRIPTION="X.Org XRes library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-proto/resourceproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXt/libXt-9999.ebuild b/x11-libs/libXt/libXt-9999.ebuild
deleted file mode 100644
index 5737cb43..00000000
--- a/x11-libs/libXt/libXt-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs
-
-DESCRIPTION="X.Org Xt library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libSM-1.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libICE-1.0.8-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	>=x11-proto/kbproto-1.0.6-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	tc-is-cross-compiler && export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXtst/libXtst-9999.ebuild b/x11-libs/libXtst/libXtst-9999.ebuild
deleted file mode 100644
index b0d97ecd..00000000
--- a/x11-libs/libXtst/libXtst-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC="doc"
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xtst library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/recordproto-1.14.2-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/inputproto-2.3:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXtst/metadata.xml b/x11-libs/libXtst/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libXtst/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/libXv/libXv-9999.ebuild b/x11-libs/libXv/libXv-9999.ebuild
deleted file mode 100644
index 635e371b..00000000
--- a/x11-libs/libXv/libXv-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xv library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/videoproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXvMC/libXvMC-9999.ebuild b/x11-libs/libXvMC/libXvMC-9999.ebuild
deleted file mode 100644
index 06875557..00000000
--- a/x11-libs/libXvMC/libXvMC-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org XvMC library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXv-1.0.10:=[${MULTILIB_USEDEP}]
-	>=x11-proto/videoproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-PDEPEND="app-eselect/eselect-xvmc"
diff --git a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
deleted file mode 100644
index fb930c58..00000000
--- a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xxf86dga library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86dgaproto-2.1-r2:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild b/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
deleted file mode 100644
index f71fa5c1..00000000
--- a/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Xxf86misc library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-proto/xproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
deleted file mode 100644
index 47ad6bf5..00000000
--- a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xxf86vm library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdmx/libdmx-9999.ebuild b/x11-libs/libdmx/libdmx-9999.ebuild
deleted file mode 100644
index 02f57157..00000000
--- a/x11-libs/libdmx/libdmx-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org dmx library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	>=x11-proto/dmxproto-2.3
-	x11-proto/xextproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libfontenc/libfontenc-9999.ebuild b/x11-libs/libfontenc/libfontenc-9999.ebuild
deleted file mode 100644
index a10616b8..00000000
--- a/x11-libs/libfontenc/libfontenc-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org fontenc library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
-)
diff --git a/x11-libs/libfontenc/metadata.xml b/x11-libs/libfontenc/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libfontenc/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/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
deleted file mode 100644
index 149ceb5d..00000000
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-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 ~amd64-fbsd ~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-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		"$(use_with zlib)"
-		"--with-pciids-path=${EPREFIX}/usr/share/misc"
-	)
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		dodir /usr/bin
-		${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
-	fi
-}
diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/libpciaccess/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/libvdpau-va-gl/Manifest b/x11-libs/libvdpau-va-gl/Manifest
deleted file mode 100644
index f34f0a69..00000000
--- a/x11-libs/libvdpau-va-gl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libvdpau-va-gl-0.3.4.tar.gz 99105 SHA256 5506896d11fcf5d4537d0b9a6cb7404da9b26796f6445913779617fbd85d550b SHA512 20db58c071eb25b7d53409c2ea2350173c0b5736fae2416a73dc548330829bd48ab64f7bd523b516c9162b830b1b5784e5a863dcc90599d07fb967bdea9d3c3c WHIRLPOOL 349f3daf5fd4b2faeff60633e56124dba66c6adad6bb8d32eca742c1fca3aced76306a5455b0258d486e734e1315c5ddce757cd79e48105236f2bda74adab366
diff --git a/x11-libs/libvdpau-va-gl/libvdpau-va-gl-0.3.4.ebuild b/x11-libs/libvdpau-va-gl/libvdpau-va-gl-0.3.4.ebuild
deleted file mode 100644
index 3edfd95e..00000000
--- a/x11-libs/libvdpau-va-gl/libvdpau-va-gl-0.3.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils virtualx pax-utils
-
-DESCRIPTION="VDPAU driver with VA-API/OpenGL backend."
-HOMEPAGE="https://github.com/i-rinat/libvdpau-va-gl/"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/glu
-	virtual/ffmpeg
-	virtual/opengl
-	x11-libs/libva[X]
-	x11-libs/libvdpau
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="${RDEPEND}"
-
-DOCS=(ChangeLog README.md)
-
-src_compile() {
-	cmake-utils_src_compile
-	if use test; then
-		cmake-utils_src_make build-tests
-		pax-mark m "${BUILD_DIR}"/tests/test-*
-	fi
-}
-
-src_test() {
-	VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
-}
diff --git a/x11-libs/libvdpau-va-gl/libvdpau-va-gl-9999.ebuild b/x11-libs/libvdpau-va-gl/libvdpau-va-gl-9999.ebuild
deleted file mode 100644
index 73241ae9..00000000
--- a/x11-libs/libvdpau-va-gl/libvdpau-va-gl-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils virtualx pax-utils git-r3
-
-DESCRIPTION="VDPAU driver with VA-API/OpenGL backend."
-HOMEPAGE="https://github.com/i-rinat/libvdpau-va-gl/"
-EGIT_REPO_URI="https://github.com/i-rinat/libvdpau-va-gl.git"
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/glu
-	virtual/ffmpeg
-	virtual/opengl
-	x11-libs/libva[X]
-	x11-libs/libvdpau
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="${RDEPEND}"
-
-DOCS=(ChangeLog README.md)
-
-src_compile() {
-	cmake-utils_src_compile
-	if use test; then
-		cmake-utils_src_make build-tests
-		pax-mark m "${BUILD_DIR}"/tests/test-*
-	fi
-}
-
-src_test() {
-	VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
-}
diff --git a/x11-libs/libvdpau-va-gl/metadata.xml b/x11-libs/libvdpau-va-gl/metadata.xml
deleted file mode 100644
index ee286d67..00000000
--- a/x11-libs/libvdpau-va-gl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>nikoli@lavabit.com</email>
-		<name>Nikoli</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild
deleted file mode 100644
index a480e500..00000000
--- a/x11-libs/libxcb/libxcb-9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4,3_5} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit python-any-r1 xorg-2
-
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test xkb"
-SLOT="0/${PV}"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-	doc? ( app-doc/doxygen[dot] )
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep \
-		">=x11-proto/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc devel-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
deleted file mode 100644
index 6d157b5d..00000000
--- a/x11-libs/libxcb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>x11</herd>
-  <use>
-    <flag name="xkb">Enable the XCB keyboard extension</flag>
-  </use>
-</pkgmetadata>
diff --git a/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild b/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild
deleted file mode 100644
index 56873d65..00000000
--- a/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-XORG_EAUTORECONF="yes"
-XORG_MULTILIB="yes"
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	EGIT_REPO_URI="git://github.com/xkbcommon/${PN}"
-else
-	XORG_BASE_INDIVIDUAL_URI=""
-	SRC_URI="http://xkbcommon.org/download/${P}.tar.xz"
-fi
-
-inherit xorg-2 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="X doc test"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	>=x11-proto/kbproto-1.0.6-r1:=[${MULTILIB_USEDEP}]
-	doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(use X || use_enable X x11)
-		$(use_with doc doxygen)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
deleted file mode 100644
index 6cc39824..00000000
--- a/x11-libs/libxkbcommon/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/libxkbfile/libxkbfile-9999.ebuild b/x11-libs/libxkbfile/libxkbfile-9999.ebuild
deleted file mode 100644
index 2d5c45b5..00000000
--- a/x11-libs/libxkbfile/libxkbfile-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org xkbfile library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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/libX11
-	x11-proto/kbproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbui/libxkbui-9999.ebuild b/x11-libs/libxkbui/libxkbui-9999.ebuild
deleted file mode 100644
index 5c070bdf..00000000
--- a/x11-libs/libxkbui/libxkbui-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org xkbui library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXt
-	>=x11-libs/libxkbfile-1.0.3
-	x11-proto/kbproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxshmfence/libxshmfence-9999.ebuild b/x11-libs/libxshmfence/libxshmfence-9999.ebuild
deleted file mode 100644
index 622cf579..00000000
--- a/x11-libs/libxshmfence/libxshmfence-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Shared memory fences using futexes"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	${RDEPEND}"
diff --git a/x11-libs/startup-notification/metadata.xml b/x11-libs/startup-notification/metadata.xml
deleted file mode 100644
index 8c868061..00000000
--- a/x11-libs/startup-notification/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>freedesktop</herd>
-<maintainer>
-<email>freedesktop-bugs@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-libs/startup-notification/startup-notification-9999.ebuild b/x11-libs/startup-notification/startup-notification-9999.ebuild
deleted file mode 100644
index 545fc183..00000000
--- a/x11-libs/startup-notification/startup-notification-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-XORG_EAUTORECONF=yes
-inherit xorg-2
-
-DESCRIPTION="Application startup notification and feedback library"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/startup-notification"
-EGIT_REPO_URI="git://anongit.freedesktop.org/startup-notification"
-
-LICENSE="LGPL-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	>x11-libs/libxcb-1.6
-	>=x11-libs/xcb-util-0.3.8"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-DOCS=( AUTHORS ChangeLog NEWS doc/startup-notification.txt )
diff --git a/x11-libs/xcb-util-cursor/metadata.xml b/x11-libs/xcb-util-cursor/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/xcb-util-cursor/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-cursor/xcb-util-cursor-9999.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-9999.ebuild
deleted file mode 100644
index e6117103..00000000
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-cursor"
-
-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/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
-	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-image/metadata.xml b/x11-libs/xcb-util-image/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- 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-9999.ebuild b/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
deleted file mode 100644
index 98221fd1..00000000
--- a/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-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/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-keysyms/metadata.xml b/x11-libs/xcb-util-keysyms/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- 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-9999.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
deleted file mode 100644
index cae5c721..00000000
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-keysyms"
-
-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/libxcb:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-renderutil/metadata.xml b/x11-libs/xcb-util-renderutil/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- 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-9999.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
deleted file mode 100644
index 8c9fe5e9..00000000
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-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/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-wm/metadata.xml b/x11-libs/xcb-util-wm/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- 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-9999.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
deleted file mode 100644
index 85ecb1e4..00000000
--- a/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-wm"
-
-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/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util/metadata.xml b/x11-libs/xcb-util/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- 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-9999.ebuild b/x11-libs/xcb-util/xcb-util-9999.ebuild
deleted file mode 100644
index b44cb481..00000000
--- a/x11-libs/xcb-util/xcb-util-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-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/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-PDEPEND="
-	>=x11-libs/xcb-util-image-${PV}:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-keysyms-${PV}:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-${PV}:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-wm-${PV}:=[${MULTILIB_USEDEP}]
-"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xtrans/metadata.xml b/x11-libs/xtrans/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-libs/xtrans/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/xtrans/xtrans-9999.ebuild b/x11-libs/xtrans/xtrans-9999.ebuild
deleted file mode 100644
index 2ba94d18..00000000
--- a/x11-libs/xtrans/xtrans-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_PACKAGE_NAME="lib${PN}"
-# this package just installs some .c and .h files, no libraries
-XORG_STATIC=no
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-misc/util-macros/metadata.xml b/x11-misc/util-macros/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-misc/util-macros/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-misc/util-macros/util-macros-9999.ebuild b/x11-misc/util-macros/util-macros-9999.ebuild
deleted file mode 100644
index aebcdd65..00000000
--- a/x11-misc/util-macros/util-macros-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros"
-DESCRIPTION="X.Org autotools utility macros"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/xcb-demo/xcb-demo-9999.ebuild b/x11-misc/xcb-demo/xcb-demo-9999.ebuild
deleted file mode 100644
index 44085916..00000000
--- a/x11-misc/xcb-demo/xcb-demo-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/demo"
-DESCRIPTION="X C-language Bindings demos"
-HOMEPAGE="http://xcb.freedesktop.org"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libxcb
-	x11-libs/xcb-util"
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
deleted file mode 100644
index 01c4c004..00000000
--- a/x11-misc/xkeyboard-config/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-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
deleted file mode 100644
index 20b9c27e..00000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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/${PN}/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=x11-apps/xkbcomp-1.2.3
-	>=x11-libs/libX11-1.4.3"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	>=x11-proto/xproto-7.0.20"
-
-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
-)
-
-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
-}