rm

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

132 files changed, 279 insertions, 2821 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
index 93e873f3c387..c5947a38726b 100644
--- a/x11-drivers/linuxwacom/ChangeLog
+++ b/x11-drivers/linuxwacom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/linuxwacom
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.47 2010/01/18 15:46:57 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.48 2010/01/23 19:31:49 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -linuxwacom-0.8.3_p6.ebuild:
+  rm
 
   18 Jan 2010; Robert Buchholz <rbu@gentoo.org> metadata.xml:
   Dropping maintenance
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild
deleted file mode 100644
index 46b4d9ef405b..000000000000
--- a/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild,v 1.5 2009/12/10 08:05:10 zmedico Exp $
-
-inherit eutils autotools toolchain-funcs linux-mod
-
-DESCRIPTION="Input driver for Wacom tablets and drawing devices"
-HOMEPAGE="http://linuxwacom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tar.bz2"
-
-IUSE="gtk tcl tk usb"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-COMMON_DEPEND="x11-proto/inputproto
-	<x11-base/xorg-server-1.7
-	gtk? ( >=x11-libs/gtk+-2 )
-	tcl? ( dev-lang/tcl )
-	tk?  ( dev-lang/tk )
-	sys-fs/udev
-	sys-libs/ncurses"
-
-RDEPEND="${COMMON_DEPEND}
-	!x11-drivers/xf86-input-wacom"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )"
-S=${WORKDIR}/${P/_p/-}
-
-MODULE_NAMES="wacom(input:${S}/src:${S}/src)"
-
-wacom_check() {
-	if use module ; then
-		ebegin "Checking for wacom module"
-		linux_chkconfig_module TABLET_USB_WACOM
-		eend $?
-
-		if [[ $? -ne 0 ]] || ! [ -f "/lib/modules/${KV}/kernel/drivers/input/tablet/wacom.ko" ]; then
-			eerror "You need to have your kernel compiled with wacom as a module"
-			eerror "to let linuxwacom overwrite it."
-			eerror "Enable it in the kernel, found at:"
-			eerror
-			eerror " Device Drivers"
-			eerror "    Input device support"
-			eerror "        Tablets"
-			eerror "            <M> Wacom Intuos/Graphire tablet support (USB)"
-			eerror
-			eerror "(in the "USB support" page it is suggested to include also:"
-			eerror "EHCI , OHCI , USB Human Interface Device+HID input layer)"
-			eerror
-			eerror "Then recompile kernel. Otherwise, remove the module USE flag."
-			die "Wacom not compiled in kernel as a module!"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use module; then
-		linux-mod_pkg_setup
-		wacom_check
-		# echo "kernel version is ${KV} , name is ${KV%%-*}"
-	fi
-	ewarn "Versions of linuxwacom >= 0.7.9 require gcc >= 4.2 to compile."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix multilib-strict error for Tcl/Tk library install
-	sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in
-
-	# Remove warning parameters for gcc < 4, bug 205139
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		sed -i -e "s:-Wno-variadic-macros::" src/xdrv/Makefile.am
-	fi
-
-	epatch "${FILESDIR}/${P}-xf86config.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	if use module; then
-		myconf="${myconf} --enable-wacom"
-		myconf="${myconf} --with-kernel=${KV_OUT_DIR}"
-	fi
-
-	econf ${myconf} \
-		$(use_with tcl tcl) \
-		$(use_with tk tk) \
-		--enable-wacomdrv --enable-wacdump \
-		--disable-xf86config \
-		--enable-xsetwacom --enable-dlloader || die "econf failed"
-
-	unset ARCH
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed."
-
-	# Inelegant attempt to work around a nasty build system
-	if use module; then
-		cp "${S}"/src/*/wacom.{o,ko} "${S}"/src/
-		linux-mod_src_install
-	fi
-
-	insinto /etc/udev/rules.d/
-	doins "${S}/src/util/60-wacom.rules"
-
-	exeinto /lib/udev/
-	doexe "${FILESDIR}"/check_driver
-	doman "${FILESDIR}"/check_driver.1
-
-	dohtml -r docs/*
-	dodoc AUTHORS ChangeLog NEWS README
-
-	ewarn "Please remove any HAL .FDI files you may"
-	ewarn "previously have installed fr linuxwacom."
-}
diff --git a/x11-drivers/xf86-input-acecad/ChangeLog b/x11-drivers/xf86-input-acecad/ChangeLog
index 33a4ca0e460f..8f25ac8fcc06 100644
--- a/x11-drivers/xf86-input-acecad/ChangeLog
+++ b/x11-drivers/xf86-input-acecad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-acecad
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-acecad/ChangeLog,v 1.65 2009/12/15 19:24:16 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-acecad/ChangeLog,v 1.66 2010/01/23 19:33:04 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-acecad-1.3.0.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org>
   xf86-input-acecad-1.4.0.ebuild:
diff --git a/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.3.0.ebuild b/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.3.0.ebuild
deleted file mode 100644
index 0ce5023cb2c6..000000000000
--- a/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.3.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.3.0.ebuild,v 1.10 2009/06/23 19:56:11 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Acecad Flair input driver"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-aiptek/ChangeLog b/x11-drivers/xf86-input-aiptek/ChangeLog
index 17eb76e5a85d..7da371043a79 100644
--- a/x11-drivers/xf86-input-aiptek/ChangeLog
+++ b/x11-drivers/xf86-input-aiptek/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-aiptek
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-aiptek/ChangeLog,v 1.49 2010/01/18 19:27:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-aiptek/ChangeLog,v 1.50 2010/01/23 19:34:03 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-aiptek-1.2.0.ebuild:
+  rm
 
   18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   xf86-input-aiptek-1.3.0.ebuild:
diff --git a/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.2.0.ebuild b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.2.0.ebuild
deleted file mode 100644
index c7fe5d408616..000000000000
--- a/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.2.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.2.0.ebuild,v 1.10 2009/06/23 20:07:56 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Aiptek USB Digital Tablet Input Driver for Linux"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-citron/ChangeLog b/x11-drivers/xf86-input-citron/ChangeLog
index 6e4291d287ec..2a01a4db448c 100644
--- a/x11-drivers/xf86-input-citron/ChangeLog
+++ b/x11-drivers/xf86-input-citron/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-citron
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-citron/ChangeLog,v 1.48 2010/01/18 19:32:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-citron/ChangeLog,v 1.49 2010/01/23 19:35:03 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-citron-2.2.0.ebuild, -xf86-input-citron-2.2.1.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org>
   xf86-input-citron-2.2.2.ebuild:
diff --git a/x11-drivers/xf86-input-citron/xf86-input-citron-2.2.0.ebuild b/x11-drivers/xf86-input-citron/xf86-input-citron-2.2.0.ebuild
deleted file mode 100644
index 24bef59d63fd..000000000000
--- a/x11-drivers/xf86-input-citron/xf86-input-citron-2.2.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-citron/xf86-input-citron-2.2.0.ebuild,v 1.7 2006/10/13 23:15:49 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for citron input devices"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-citron/xf86-input-citron-2.2.1.ebuild b/x11-drivers/xf86-input-citron/xf86-input-citron-2.2.1.ebuild
deleted file mode 100644
index 5373470d0db0..000000000000
--- a/x11-drivers/xf86-input-citron/xf86-input-citron-2.2.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-citron/xf86-input-citron-2.2.1.ebuild,v 1.8 2009/06/23 20:00:03 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER="4"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for citron input devices"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-1.4.1
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-elographics/ChangeLog b/x11-drivers/xf86-input-elographics/ChangeLog
index 194fe33a3158..33064ded2cc7 100644
--- a/x11-drivers/xf86-input-elographics/ChangeLog
+++ b/x11-drivers/xf86-input-elographics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-elographics
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elographics/ChangeLog,v 1.51 2009/12/15 19:25:12 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elographics/ChangeLog,v 1.52 2010/01/23 19:36:12 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-elographics-1.2.2.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org>
   xf86-input-elographics-1.2.3.ebuild:
diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.2.2.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.2.2.ebuild
deleted file mode 100644
index af029295e6a9..000000000000
--- a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.2.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.2.2.ebuild,v 1.7 2009/05/15 15:59:56 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Elographics input driver"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-evdev/ChangeLog b/x11-drivers/xf86-input-evdev/ChangeLog
index c5a0b6502105..c83b578d8d78 100644
--- a/x11-drivers/xf86-input-evdev/ChangeLog
+++ b/x11-drivers/xf86-input-evdev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-input-evdev
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.138 2010/01/23 19:39:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.139 2010/01/23 19:40:54 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-evdev-2.1.3.ebuild, -xf86-input-evdev-2.2.2.ebuild,
+  -xf86-input-evdev-2.2.5.ebuild:
+  rm
 
   23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   xf86-input-evdev-2.3.1.ebuild, xf86-input-evdev-2.3.2.ebuild:
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.1.3.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.1.3.ebuild
deleted file mode 100644
index 960324d99fd1..000000000000
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.1.3.ebuild,v 1.12 2009/05/28 16:49:39 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Generic Linux input driver"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="hal"
-RDEPEND=">=x11-base/xorg-server-1.5.3
-	hal? ( >=sys-apps/hal-0.5.10 )"
-DEPEND="${RDEPEND}
-	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
-	>=x11-proto/inputproto-1.4
-	x11-proto/randrproto
-	x11-proto/xproto"
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-	pkg_info
-}
-
-pkg_info() {
-	if use hal; then
-		elog "If your XKB (keyboard settings) stopped working,"
-		elog "you may uninstall this driver or move your XKB configuration."
-		elog "Download an example from http://dev.gentoo.org/~scarabeus/hal-config-examples/"
-		elog "(these will be installed with sys-apps/hal soon),"
-		elog "and drop it into /etc/hal/fdi/policy/"
-	fi
-}
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.2.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.2.ebuild
deleted file mode 100644
index 9716c63811b1..000000000000
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.2.ebuild,v 1.2 2009/06/23 19:53:35 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Generic Linux input driver"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.5.3"
-DEPEND="${RDEPEND}
-	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
-	>=x11-proto/inputproto-1.4
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.5.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.5.ebuild
deleted file mode 100644
index 3a3521392288..000000000000
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.5.ebuild,v 1.7 2009/12/15 15:21:33 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Generic Linux input driver"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sh sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.5.3"
-DEPEND="${RDEPEND}
-	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
-	>=x11-proto/inputproto-1.4
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-fpit/ChangeLog b/x11-drivers/xf86-input-fpit/ChangeLog
index 0cfc0b192031..a2e6f3bb4841 100644
--- a/x11-drivers/xf86-input-fpit/ChangeLog
+++ b/x11-drivers/xf86-input-fpit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-input-fpit
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-fpit/ChangeLog,v 1.56 2009/12/15 19:25:51 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-fpit/ChangeLog,v 1.57 2010/01/23 19:43:29 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/xf86-input-fpit-update1.diff, -xf86-input-fpit-1.2.0.ebuild,
+  -files/xf86-input-fpit-update2.diff, -files/xf86-input-fpit-update3.diff,
+  -xf86-input-fpit-1.1.0-r1.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org> xf86-input-fpit-1.3.0.ebuild:
   Marking xf86-input-fpit-1.3.0 ppc64 stable for bug 294958
diff --git a/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-update1.diff b/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-update1.diff
deleted file mode 100644
index 81ef3798f16a..000000000000
--- a/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-update1.diff
+++ /dev/null
@@ -1,400 +0,0 @@
-commit 4b06c8f70e8b1d6cfaeb41e1584f9efcfef83bb0
-Author: Justin Blanchard <justinb04@aim.com>
-Date:   Tue Jan 30 20:12:07 2007 -0500
-
-    Updates from Justin Blanchard - patch 1
-    
-    * Make the docs reflect more accurately what the code actually does.
-    * Update the docs: remove material specific to XFree86 3.x/4.0. Re-organize to
-    reflect the wider variety of machines that use this device. Change the link to
-    linuxslate.com. Expand troubleshooting section.
-    * Code cleanup: assorted trivial changes.
-
-diff --git a/man/fpit.man b/man/fpit.man
-index fba0e6f..4964dbe 100644
---- a/man/fpit.man
-+++ b/man/fpit.man
-@@ -23,11 +23,15 @@ driver functions as a pointer input devi
- X server's core pointer.
- .SH SUPPORTED HARDWARE
- This driver supports the touchscreen of the Stylistic LT and (with
--special options) of the Stylistic 500, 1000 and 2300.
-+special options) of the Stylistic 500, 1000, 1200, 2300, and 3400.
-+Modern FinePoint MP800 devices will also work with this driver.
- 
--Under Linux the Fujitsus serial port is not, by default, detected.
--Therefore the following must be added to one of your start-up scripts.
--(Either one of the X scripts, or to rc.local or similar).
-+Under Linux the Fujitsu's serial port is not, by default, detected.
-+Therefore the port must be configured manually as described in the
-+accompanying readme.txt file.
-+
-+For example, add the following to your startup scripts for Stylistic xx00
-+devices:
- 
- .TP 4
- .B setserial /dev/ttyS3 autoconfig
-@@ -70,12 +74,12 @@ Same as for X axis, but for Y axis.
- Invert the specified axis.
- .TP 4
- .B Option \fI"SwapXY"\fP
--Swap the X and Y axis.
-+Swap the X and Y axis (after inversions).
- .TP 4
- .B Option \fI"Rotate"\fP \fI"CW"\fP
- .B Option \fI"Rotate"\fP \fI"CWW"\fP
- Manipulate the invert and swap options to match screen
--rotations.
-+rotations. (Will behave strangely if combined with invert or swap options.)
- .TP 4
- .B Option \fI"DeviceName"\fP \fI"name"\fP
- .B Option \fI"DeviceName"\fP \fI"name"\fP
-@@ -92,7 +96,7 @@ enabled for any other value.
- .B Option \fI"DebugLevel"\fP \fInumber \fP
- sets the level of debugging info reported.
- .TP 4
--.B Option \fI"BaudRate"\fP \fI"38400"\fP, \fI"19200"\fP or \fI"9600"\fP (default)
-+.B Option \fI"BaudRate"\fP \fI"38400"\fP, \fI"19200"\fP (default) or \fI"9600"\fP
- changes the serial link speed.
- .TP 4
- .B Option \fI"Passive"\fP
-diff --git a/readme.txt b/readme.txt
-index fd0990c..075c52e 100644
---- a/readme.txt
-+++ b/readme.txt
-@@ -1,15 +1,8 @@
- xf86Fpit.c
- (and associated files).
- 
--Documentation updated by John Apfelbaum, linuxslate.com Oct 2001
--
--***    P L E A S E     N O T E    ***
--*  Due to a Hardrive failure, the version of this driver that was previously
--*  on the linuxslate.com website was lost. This is a version came from a
--*  directory on my development system that was marked "Works", and I belive it
--*  to be the latest version I worked on (about a year ago), but I have not had
--*  time to build from this source and verify this driver.
--***
-+Last updated Jan 2007
-+This information applies to version 1.1.0 of this driver.
- 
- Supported Hardware:
- 
-@@ -19,6 +12,8 @@ Supported Hardware:
- 	Fujistu Stylistic 1000  (Should Work)
- 	Fujistu Stylistic 1200  (Should Work)
- 	Fujistu Stylistic 2300  (Should Work)
-+	Fujitsu Stylistic 3400  (and possibly other passive-pen systems)
-+	FinePoint MP800
- 
- History and Contributors:
- 
-@@ -30,9 +25,11 @@ History and Contributors:
-    project into the XFree86 4.0.2 Elographics driver by Patrick Lecoanet.
- -  John Apfelbaum continuted the work to produce a working XFree86 4.0.x driver for the
-    Stylistic 1200.  
---  David Clay added support for Stylistic 3400 passive pen.
-+-  David Clay added support for Stylistic 3400 passive pen, and possibly
-+   others. (Also fixed processing of all packets, and enabled right mouse button.)
- 
--Please visit http://linuxslate.com for the latest information.
-+Please visit http://webcvs.freedesktop.org/xorg/driver/xf86-input-fpit/ for the
-+latest version of this driver.
- 
- License:
- 
-@@ -52,73 +49,53 @@ Please visit http://XFree86.org for lice
- 
- Installation:
- 
--THIS RELEASE IS FOR XFree86 Version 4.0.2. Hopefully it will also work
--with other Version 4 systems. The source is written so that hopefully
--it can be compiled under 3.3.6 - THIS HAS NOT BEEN TESTED (yet).
--
--Copied from original xf86fpit.c readme:
--
- 1.  Install and configure Linux w/o consideration of the digitizer tablet.
- 2.  Get X working the way you want it. 
--3.  Add or Change your appropriate startup scripts to include:
-+3.  Set up a serial device to be initialized at startup.
-+    Modify /etc/serial.conf if your distribution uses it. Otherwise
-+    add or modify your appropriate startup scripts to include:
- 
- setserial /dev/ttyS3 autoconfig
--setserial /dev/ttyS3 IRQ 15 baud_base 115200
--(Some models may also have to specify:  port 0xfce8)
-+setserial /dev/ttyS3 port ??? IRQ ?? baud_base 115200 [uart 16450]
- 
--
--New/Different for Ver 4.0.2
-+The uart setting may be necessary for the device to work.
-+See below for appropriate port/IRQ values.
- 
- 4.  Copy fpit_drv.o to /usr/X11R6/lib/modules/input
- 
--5.  Add the following to your XF86Config(-4) file:
-+5.  Add the following to your X config file (XF86Config/XF86Config-4/xorg.conf)
- 
- Section "InputDevice"
- 	Identifier	"mouse0"
- 	Driver		"fpit"
- 	Option		"Device"	"/dev/ttyS3"
-+	# These may need tweaking; see below.
- 	Option		"BaudRate"	"19200"
- 	Option		"MaximumXPosition"	"6250"
- 	Option		"MaximumYPosition"	"4950"
- 	Option		"MinimumXPosition"	"130"
- 	Option		"MinimumYPosition"	"0"
- 	Option		"InvertY"
-+	# For a passive pen, e.g. Stylistic 3400
-+	Option		"Passive"
- EndSection
- 
- 6. Remember to add this Input Device to the server description (Near the end of the file.)
- 
- 7. Start or restart X.
- 
--8. If required adjust the Min/Max X/Y positions so that the pointer
-+8. If required adjust the baud rate and Min/Max X/Y positions so that the pointer
-    tracks the pen correctly.
- 
-+For Fujitsu Stylistic xx00 models, try IRQ 15, with port either unspecified
-+ or set to 0xfce8.
- 
--New for Ver 4.5.0
--
-- * supports Stylistic 3400 (and possibly other passive-pen systems)
-- * Fixed processing of all packets
-- * Fixed hover-mode pointer movement
-- * Added Passive parameter for passive displays
-- * Added switch 3 for "right" mouse button
--
--Try this serial configuration for the 3400:
-+For Fujitsu Stylistic 3400 models, try IRQ 4 and port 0xfd68.
-+ Recommended X config settings are BaudRate 9600, Min X/Y 0, MaxX 4070, MaxY 4020.
- 
--setserial /dev/ttyS3 autoconfig
--setserial /dev/ttyS3 uart 16450 irq 5 port 0xfd68
--
--Try this config for the 3400:
--Section "InputDevice"
--    Identifier "mouse0"
--    Driver     "fpit"       
--    Option     "Device"   "/dev/ttyS3"
--    Option     "BaudRate" "9600"   
--    Option     "Passive"
--    Option     "MaximumXPosition" "4070"  
--    Option     "MaximumYPosition" "4020"  
--    Option     "MinimumXPosition" "0"     
--    Option     "MinimumYPosition" "0"  
--    Option     "SendCoreEvents"
--EndSection
-+In general you may wish to consult /proc/ioports or /sys/devices/pnp0/*
-+(under Linux 2.6) for serial information. BaudRate should generally be 9600,
-+19200, or 38400.
- 
- 
- Hints if you are having problems (Thanks to Aron Hsiao):
-@@ -135,6 +112,8 @@ This should be re-stating the defaults,
- to be an XFree86 4.x bug. 
- 
- Problem 2:  X Server crash during GUI startup (Particularly Gnome). 
-+            Or: programs using high-resolution pen tracking via XInput
-+            don't work.
- 
- Solution:   You must have a regular mouse defined as the default pointer
- 	    even if no mouse is used.  During startup, Gnome attempts to
-@@ -142,6 +121,10 @@ Solution:   You must have a regular mous
- 	    pendrivers are absolute pointers, and acceleration is meaningless,
- 	    they do not take well to attempts to set it :-)
- 
-+	    Additionally, setting the tablet as a core pointer prevents X
-+            from sending XInput events. This lowers the pen-tracking
-+            resolution available to programs by 1 or 2 orders of magnitude!
-+
- Problem 3:  Jittery cursor and undesired mouse clicks (both buttons),
-             particuarly on the Stylistic 1200, and particuarly after the
- 	    system has warmed up.
-@@ -152,6 +135,9 @@ Solution:   (Not really a solution) This
- 	    actively using it extends battery life, and keeps the system from
- 	    getting too hot.
- 
-+            If cursor movement seems completely random and mouse clicks seem
-+            inexplicable, your baud rate may be set incorrectly.
-+
- Bugs and Needed Work:
- 
- (See above)
-diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
-index b7a9a60..d0b9fe3 100644
---- a/src/xf86Fpit.c
-+++ b/src/xf86Fpit.c
-@@ -63,8 +63,6 @@
- 
- #  include <misc.h>
- #  include <xf86.h>
--#  if !defined(DGUX)
--#  endif
- #  include <xf86_OSproc.h>
- #  include <xf86Xinput.h>
- #  include <exevents.h>
-@@ -79,7 +77,6 @@
-  *
-  ***************************************************************************
-  */
--#define FPIT_LINK_SPEED		B19200	/* 19200 Baud                           */
- #define FPIT_PORT		"/dev/ttyS3"
- 
- #define FPIT_MAX_X		4100
-@@ -87,19 +84,6 @@
- #define FPIT_MAX_Y		4100
- #define FPIT_MIN_Y		0
- 
--#define PHASING_BIT	0x80
--#define PROXIMITY_BIT	0x20 /* DMC: This was 0x40 but the chart says its bit 5 which is 0x20 */
--/*#define TABID_BIT	0x20  */
--#define XSIGN_BIT	0x10
--#define YSIGN_BIT	0x08
--#define BUTTON_BITS	0x07
--#define COORD_BITS	0x7f
--
--/* DMC: Added these */
--#define SW1	0x01
--#define SW2	0x02
--#define SW3	0x04
--
- 
- /*
-  ***************************************************************************
-@@ -123,8 +107,6 @@ typedef struct {
- 	int screen_width;
- 	int screen_height;
- 	int screen_no;
--	int fpitInc;		/* increment between transmits */
--	int fpitButTrans;	/* button translation flags */
- 	int fpitOldX;		/* previous X position */
- 	int fpitOldY;		/* previous Y position */
- 	int fpitOldProximity;	/* previous proximity */
-@@ -135,10 +117,7 @@ typedef struct {
- 	int fpitMaxY;		/* max Y value */
- 	int fpitInvX;		/* Invert X axis */
- 	int fpitInvY;		/* Invert Y axis */
--	int fpitRes;		/* resolution in lines per inch */
--	int flags;		/* various flags */
- 	int fpitIndex;		/* number of bytes read */
--	int fpitBaud;		/* Baud rate of device */
- 	unsigned char fpitData[BUFFER_SIZE];	/* data read on the device */
- 	int fpitSwapXY;		/* swap X and Y values */
- 	int fpitPassive;	/* translate passive buttons */
-@@ -209,37 +188,45 @@ static void xf86FpitReadInput(LocalDevic
- 
- 	priv->fpitIndex += len;
- 
--	/* process each packet in this block */
--	for (loop=0;loop+FPIT_PACKET_SIZE<=priv->fpitIndex;loop++) { 
--		if (!(priv->fpitData[loop] & 0x80)) continue; /* we don't have a start bit yet */
- 
-+#define PHASING_BIT	0x80
-+#define PROXIMITY_BIT	0x20
-+#define BUTTON_BITS	0x07
-+#define SW1	0x01
-+#define SW2	0x02
-+#define SW3	0x04
-+
-+	/* process each packet in this block */
- /* Format of 5 bytes data packet for Fpit Tablets
-      Byte 1
--       bit 7  Phasing bit always 1
--       bit 6  Switch status change
--       bit 5  Proximity
--       bit 4  Always 0
--       bit 3  Test data
--       bit 2  Sw3 (2nd side sw) 
--       bit 1  Sw2 (1st side sw) 
--       bit 0  Sw1 (Pen tip sw) 
-+       bit  7   (0x80)  Phasing bit always 1
-+       bit  6   (0x40)  Switch status change
-+       bit  5   (0x20)  Proximity
-+       bit  4   (0x10)  Always 0
-+       bit  3   (0x08)  Test data
-+       bits 2-0 (0x07)  Buttons:
-+       bit  2   (0x04)   Sw3 (2nd side sw) 
-+       bit  1   (0x02)   Sw2 (1st side sw) 
-+       bit  0   (0x01)   Sw1 (Pen tip sw) 
- 
-      Byte 2
--       bit 7  Always 0
--       bits 6-0 = X6 - X0
-+       bit  7   (0x80)  Always 0
-+       bits 6-0 (0x7f)  X6 - X0
- 
-      Byte 3
--       bit 7  Always 0
--       bits 6-0 = X13 - X7
-+       bit  7   (0x80)  Always 0
-+       bits 6-0 (0x7f)  X13 - X7
- 
-      Byte 4
--       bit 7  Always 0
--       bits 6-0 = Y6 - Y0
-+       bit  7   (0x80)  Always 0
-+       bits 6-0 (0x7f)  Y6 - Y0
- 
-      Byte 5
--       bit 7  Always 0
--       bits 6-0 = Y13 - Y7
-+       bit  7   (0x80)  Always 0
-+       bits 6-0 (0x7f)  Y13 - Y7
- */
-+	for (loop=0;loop+FPIT_PACKET_SIZE<=priv->fpitIndex;loop++) { 
-+		if (!(priv->fpitData[loop] & PHASING_BIT)) continue; /* we don't have a start bit yet */
- 
- 		x = (int) (priv->fpitData[loop + 1] & 0x7f) + ((int) (priv->fpitData[loop + 2] & 0x7f) << 7);
- 		y = (int) (priv->fpitData[loop + 3] & 0x7f) + ((int) (priv->fpitData[loop + 4] & 0x7f) << 7);
-@@ -256,7 +243,7 @@ static void xf86FpitReadInput(LocalDevic
- 		xf86FpitConvert(local, 0, 2, x, y, 0, 0, 0, 0, &conv_x, &conv_y);
- 		xf86XInputSetScreen(local, priv->screen_no, conv_x, conv_y);
- 
--		/* coordonates are ready we can send events */
-+		/* coordinates are ready we can send events */
- 
- 		if (prox!=priv->fpitOldProximity) /* proximity changed */
- 			if (!is_core_pointer) xf86PostProximityEvent(device, prox, 0, 2, x, y);
-@@ -268,9 +255,7 @@ static void xf86FpitReadInput(LocalDevic
- 			/*
- 				For passive pen (Stylistic 3400, et al.):
- 				sw1 = 1 if pen is moving
--				sw1 = 0 if pen is not moving
--				sw2 = 0 if pen is contacting the pad
--				sw2 = 1 if pen was lifted from the pad
-+				sw2 = 1 if pen was lifted from the pad / isn't in contact
- 				sw3 = 1 if right mouse-button icon was chosen
- 			*/
- 			/* convert the pen button bits to actual mouse buttons */
-@@ -378,7 +363,7 @@ static Bool xf86FpitControl(DeviceIntPtr
- 			 * screen to fit one meter.
- 			 */
- 			if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, local->history_size, Absolute) == FALSE) {
--				ErrorF("Unable to allocate Elographics touchscreen ValuatorClassDeviceStruct\n");
-+				ErrorF("Unable to allocate Fpit touchscreen ValuatorClassDeviceStruct\n");
- 				return !Success;
- 			} else {
- 				InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
-@@ -542,13 +527,13 @@ static InputInfoPtr xf86FpitInit(InputDr
- 	xf86Msg(X_CONFIG, "FPIT device name: %s\n", local->name);
- 	priv->screen_no = xf86SetIntOption(local->options, "ScreenNo", 0);
- 	xf86Msg(X_CONFIG, "Fpit associated screen: %d\n", priv->screen_no);
--	priv->fpitMaxX = xf86SetIntOption(local->options, "MaximumXPosition", 4100);
-+	priv->fpitMaxX = xf86SetIntOption(local->options, "MaximumXPosition", FPIT_MAX_X);
- 	xf86Msg(X_CONFIG, "FPIT maximum x position: %d\n", priv->fpitMaxX);
--	priv->fpitMinX = xf86SetIntOption(local->options, "MinimumXPosition", 0);
-+	priv->fpitMinX = xf86SetIntOption(local->options, "MinimumXPosition", FPIT_MIN_X);
- 	xf86Msg(X_CONFIG, "FPIT minimum x position: %d\n", priv->fpitMinX);
--	priv->fpitMaxY = xf86SetIntOption(local->options, "MaximumYPosition", 4100);
-+	priv->fpitMaxY = xf86SetIntOption(local->options, "MaximumYPosition", FPIT_MAX_Y);
- 	xf86Msg(X_CONFIG, "FPIT maximum y position: %d\n", priv->fpitMaxY);
--	priv->fpitMinY = xf86SetIntOption(local->options, "MinimumYPosition", 0);
-+	priv->fpitMinY = xf86SetIntOption(local->options, "MinimumYPosition", FPIT_MIN_Y);
- 	xf86Msg(X_CONFIG, "FPIT minimum y position: %d\n", priv->fpitMinY);
- 	priv->fpitInvX = xf86SetBoolOption(local->options, "InvertX", 0);
- 	priv->fpitInvY = xf86SetBoolOption(local->options, "InvertY", 0);
diff --git a/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-update2.diff b/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-update2.diff
deleted file mode 100644
index 120db6e4b533..000000000000
--- a/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-update2.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 979c283a6ecb1ba718790a147b3e910a106cb473
-Author: Justin Blanchard <justinb04@aim.com>
-Date:   Tue Jan 30 20:13:52 2007 -0500
-
-    update from Justin Blanchard - part 2
-    
-    * Fix a bug that prevents active-pen users from right-clicking while hovering.
-    * Bug was introduced with passive pen support; fix is simple and has been
-    recommended in forums since Oct 2006
-    (http://ubuntuforums.org/showpost.php?p=1620646&postcount=15).
-    For some reason I don't see a bug report for the issue.
-
-diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
-index d0b9fe3..636d6d0 100644
---- a/src/xf86Fpit.c
-+++ b/src/xf86Fpit.c
-@@ -262,11 +262,9 @@ static void xf86FpitReadInput(LocalDevic
- 			if (buttons & SW2) buttons=0; /* the pen was lifted, so no buttons are pressed */
- 			else if (buttons & SW3) buttons=SW3; /* the "right mouse" button was pressed, so send down event */
- 			else if (prox) buttons=SW1; /* the "left mouse" button was pressed and we are not hovering, so send down event */
--			else buttons=0; /* We are in hover mode, so no buttons */
--		}
--		else { /* the active pen's buttons map directly to the mouse buttons */
--			if (!prox) buttons=0; /* We are in hover mode, so no buttons */
-+			else buttons=0; /* We are in hover mode, so not left-clicking. */
- 		}
-+		/* the active pen's buttons map directly to the mouse buttons. Right-click may happen even in hover mode. */
- 	
- 		/* DBG(2, ErrorF("%02d/%02d Prox=%d SW:%x Buttons:%x->%x (%d, %d)\n",
- 			loop,priv->fpitIndex,prox,priv->fpitData[loop]&BUTTON_BITS,priv->fpitOldButtons,buttons,x,y));*/
diff --git a/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-update3.diff b/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-update3.diff
deleted file mode 100644
index a232a9d8631e..000000000000
--- a/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-update3.diff
+++ /dev/null
@@ -1,355 +0,0 @@
-commit cb6adfe32f929e57eedcab189e9f359fc9e970ab
-Author: Justin Blanchard <justinb04@aim.com>
-Date:   Tue Jan 30 20:15:50 2007 -0500
-
-    update from Justin Blanchard - part 3
-    
-    * Adds support for detecting/responding to screen resize and rotate events
-    (i.e., fixing bug 3421 for FPIT users). This corrects both cursor-related and
-    extended events.
-    * The fix is disabled unless the user adds 'Option "TrackRandR"' to the
-    InputDevice section. This is to avoid breaking setups where some nightmarish
-    workaround was already in place.
-    * Use of RRGetRotation may break driver under XFree86. If this is a problem I
-    think xf86GetRotation can be used instead.
-
-diff --git a/man/fpit.man b/man/fpit.man
-index 4964dbe..1809d2b 100644
---- a/man/fpit.man
-+++ b/man/fpit.man
-@@ -80,6 +80,7 @@ Swap the X and Y axis (after inversions)
- .B Option \fI"Rotate"\fP \fI"CWW"\fP
- Manipulate the invert and swap options to match screen
- rotations. (Will behave strangely if combined with invert or swap options.)
-+New users should consider the \fI"TrackRandR"\fP option instead.
- .TP 4
- .B Option \fI"DeviceName"\fP \fI"name"\fP
- .B Option \fI"DeviceName"\fP \fI"name"\fP
-@@ -101,6 +102,9 @@ changes the serial link speed.
- .TP 4
- .B Option \fI"Passive"\fP
- decodes the passive pen.
-+.B Option \fI"TrackRandR"\fP
-+automatically keeps the cursor synchronized with the pen's position, even when
-+the screen is resized or rotated. (Recommended for tablet PC's.)
- .RE
- 
- Example, for Stylistic LT setup is:
-@@ -109,6 +113,7 @@ Example, for Stylistic LT setup is:
- .BI "  Identifier \*q" mouse0 \*q
- .B  "  Driver \*qfpit\*q"
- .BI "  Option \*qDevice\*q   \*q"/dev/ttyS3 \*q
-+.BI "  # Option \*qTrackRandR\*q"
- .B EndSection
- .fi
- 
-@@ -124,6 +129,7 @@ And for other Stylistic devices try:
- .BI "  Option \*qMinimumXPosition\*q \*q"130 \*q
- .BI "  Option \*qMinimumYPosition\*q \*q"0 \*q
- .BI "  Option \*qInvertY\*q"
-+.BI "  # Option \*qTrackRandR\*q"
- .B EndSection
- .fi
- 
-@@ -140,6 +146,7 @@ For Stylistic 3400:
- .BI "  Option \*qMinimumYPosition\*q \*q"0 \*q
- .BI "  Option \*qPassive\*q"
- .BI "  Option \*qSendCoreEvents\*q"
-+.BI "  # Option \*qTrackRandR\*q"
- .B EndSection
- .fi
- 
-diff --git a/readme.txt b/readme.txt
-index 075c52e..3e6051c 100644
---- a/readme.txt
-+++ b/readme.txt
-@@ -78,6 +78,9 @@ Section "InputDevice"
- 	Option		"InvertY"
- 	# For a passive pen, e.g. Stylistic 3400
- 	Option		"Passive"
-+	# To make the touchscreen respond automatically to
-+	# resolution changes and screen rotation:
-+	Option		"TrackRandR"
- EndSection
- 
- 6. Remember to add this Input Device to the server description (Near the end of the file.)
-@@ -142,8 +145,6 @@ Bugs and Needed Work:
- 
- (See above)
- 
--X rotation (Portrait mode is not supported). -- I plan to add this soon.
--
- Adjusting the constants in the XF86Config(-4) is teedious and requires
- multiple restarts of the X Window system.  -- Somebody PLEASE write a
- calibration program !
-diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
-index 636d6d0..99d8bdb 100644
---- a/src/xf86Fpit.c
-+++ b/src/xf86Fpit.c
-@@ -66,6 +66,7 @@
- #  include <xf86_OSproc.h>
- #  include <xf86Xinput.h>
- #  include <exevents.h>
-+#  include <randrstr.h>
- 
- #  include <xf86Module.h>
- 
-@@ -98,6 +99,20 @@
- /*
-  ***************************************************************************
-  *
-+ * Screen orientation descriptors.
-+ *
-+ ***************************************************************************
-+ */
-+
-+typedef enum {
-+	FPIT_INVERT_X     = 0x01,
-+	FPIT_INVERT_Y     = 0x02,
-+	FPIT_THEN_SWAP_XY = 0x04
-+} FpitOrientation;
-+
-+/*
-+ ***************************************************************************
-+ *
-  * Device private records.
-  *
-  ***************************************************************************
-@@ -106,6 +121,7 @@ typedef struct {
- 	char *fpitDev;		/* device file name */
- 	int screen_width;
- 	int screen_height;
-+	Rotation screen_rotation;
- 	int screen_no;
- 	int fpitOldX;		/* previous X position */
- 	int fpitOldY;		/* previous Y position */
-@@ -115,12 +131,14 @@ typedef struct {
- 	int fpitMinY;		/* min Y value */
- 	int fpitMaxX;		/* max X value */
- 	int fpitMaxY;		/* max Y value */
--	int fpitInvX;		/* Invert X axis */
--	int fpitInvY;		/* Invert Y axis */
- 	int fpitIndex;		/* number of bytes read */
- 	unsigned char fpitData[BUFFER_SIZE];	/* data read on the device */
--	int fpitSwapXY;		/* swap X and Y values */
-+	FpitOrientation fpitBaseOrientation;	/* read from X config */
-+	FpitOrientation fpitTotalOrientation;	/* above + RandR */
- 	int fpitPassive;	/* translate passive buttons */
-+	int fpitTrackRandR;	/* check for, react to screen rotate/resize */
-+	/* XXX when this last option is unset, we provide "compatibly stupid"
-+	 * behavior. */
- } FpitPrivateRec, *FpitPrivatePtr;
- 
- 
-@@ -139,21 +157,73 @@ typedef struct {
- static Bool xf86FpitConvert(LocalDevicePtr local, int first, int num, int v0, int v1, int v2, int v3, int v4, int v5, int *x, int *y)
- {
- 	FpitPrivatePtr priv = (FpitPrivatePtr) local->private;
-+	AxisInfoPtr axes = local->dev->valuator->axes;
- 	if (first != 0 || num != 2) {
- 		return FALSE;
- 	}
- 
--	if (priv->fpitSwapXY != 0) {
--		*x = xf86ScaleAxis(v1, 0, priv->screen_width, priv->fpitMinY, priv->fpitMaxY);
--		*y = xf86ScaleAxis(v0, 0, priv->screen_height, priv->fpitMinX, priv->fpitMaxX);
--	} else {
--		*x = xf86ScaleAxis(v0, 0, priv->screen_width, priv->fpitMinX, priv->fpitMaxX);
--		*y = xf86ScaleAxis(v1, 0, priv->screen_height, priv->fpitMinY, priv->fpitMaxY);
--	}
-+	*x = xf86ScaleAxis(v0, 0, priv->screen_width, axes[0].min_value, axes[0].max_value);
-+	*y = xf86ScaleAxis(v1, 0, priv->screen_height, axes[1].min_value, axes[1].max_value);
-+
- 	return TRUE;
- }
- 
- /*
-+ ***************************************************************************
-+ *
-+ * xf86FpitSetUpAxes --
-+ *	Based on current screen resolution and, if RandR support is enabled,
-+ *	current rotation state, set up the XInput axes and orientation info.
-+ *
-+ ***************************************************************************
-+ */
-+
-+static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv)
-+{
-+	/*
-+	 * Device reports motions on 2 axes in absolute coordinates.
-+	 * Axes min and max values are reported in raw coordinates.
-+	 * Resolution is computed roughly by the difference between
-+	 * max and min values scaled from the approximate size of the
-+	 * screen to fit one meter.
-+	 */
-+	int quarter_turns;
-+
-+	priv->screen_width = screenInfo.screens[priv->screen_no]->width;
-+	priv->screen_height = screenInfo.screens[priv->screen_no]->height;
-+
-+	priv->fpitTotalOrientation = priv->fpitBaseOrientation;
-+	if (!priv->fpitTrackRandR)
-+		return;
-+
-+	/* now apply transforms specified by RandR:
-+	 * slightly complicated because invertX/Y and swapXY don't commute. */
-+	priv->screen_rotation = RRGetRotation(screenInfo.screens[priv->screen_no]);
-+	quarter_turns = (
-+		(priv->screen_rotation & RR_Rotate_90  ? 1 : 0) +
-+		(priv->screen_rotation & RR_Rotate_180 ? 2 : 0) +
-+		(priv->screen_rotation & RR_Rotate_270 ? 3 : 0) ) % 4;
-+	if (quarter_turns / 2 != 0)
-+		priv->fpitTotalOrientation ^= FPIT_INVERT_X | FPIT_INVERT_Y;
-+	if (quarter_turns % 2 != 0) {
-+		priv->fpitTotalOrientation ^=
-+		    (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY ? FPIT_INVERT_X : FPIT_INVERT_Y)
-+		    | FPIT_THEN_SWAP_XY;
-+	}
-+
-+	if (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY) {
-+		InitValuatorAxisStruct(dev, 1, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
-+				       9500 /* max_res */ );
-+		InitValuatorAxisStruct(dev, 0, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
-+				       10500 /* max_res */ );
-+	} else {
-+		InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
-+				       9500 /* max_res */ );
-+		InitValuatorAxisStruct(dev, 1, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
-+				       10500 /* max_res */ );
-+	}
-+}
-+/*
- ** xf86FpitReadInput
- ** Reads from the Fpit and posts any new events to the server.
- */
-@@ -166,6 +236,13 @@ static void xf86FpitReadInput(LocalDevic
- 	DeviceIntPtr device;
- 	int conv_x, conv_y;
- 	
-+	if (priv->fpitTrackRandR && (
-+		priv->screen_width  != screenInfo.screens[priv->screen_no]->width  ||
-+		priv->screen_height != screenInfo.screens[priv->screen_no]->height ||
-+		priv->screen_rotation != RRGetRotation(screenInfo.screens[priv->screen_no])
-+	))
-+		xf86FpitSetUpAxes(local->dev, priv);
-+
-   do { /* keep reading blocks until there are no more */
- 
- 	/* Read data into buffer */
-@@ -230,11 +307,15 @@ static void xf86FpitReadInput(LocalDevic
- 
- 		x = (int) (priv->fpitData[loop + 1] & 0x7f) + ((int) (priv->fpitData[loop + 2] & 0x7f) << 7);
- 		y = (int) (priv->fpitData[loop + 3] & 0x7f) + ((int) (priv->fpitData[loop + 4] & 0x7f) << 7);
--		/* Add in any offsets */
--		if (priv->fpitInvX)
-+		/* Adjust to orientation */
-+		if (priv->fpitTotalOrientation & FPIT_INVERT_X)
- 			x = priv->fpitMaxX - x + priv->fpitMinX;
--		if (priv->fpitInvY)
-+		if (priv->fpitTotalOrientation & FPIT_INVERT_Y)
- 			y = priv->fpitMaxY - y + priv->fpitMinY;
-+		if (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY) {
-+			int z = x; x = y; y = z;
-+		}
-+
- 		prox = (priv->fpitData[loop] & PROXIMITY_BIT) ? 0 : 1;
- 		buttons = (priv->fpitData[loop] & BUTTON_BITS);
- 		device = local->dev;
-@@ -334,8 +415,6 @@ static Bool xf86FpitControl(DeviceIntPtr
- 			if (priv->screen_no >= screenInfo.numScreens || priv->screen_no < 0) {
- 				priv->screen_no = 0;
- 			}
--			priv->screen_width = screenInfo.screens[priv->screen_no]->width;
--			priv->screen_height = screenInfo.screens[priv->screen_no]->height;
- 			/*
- 			 * Device reports button press for up to 3 buttons.
- 			 */
-@@ -353,22 +432,11 @@ static Bool xf86FpitControl(DeviceIntPtr
- 				ErrorF("Unable to allocate PtrFeedBackClassDeviceStruct\n");
- 			}
- 	      
--			/*
--			 * Device reports motions on 2 axes in absolute coordinates.
--			 * Axes min and max values are reported in raw coordinates.
--			 * Resolution is computed roughly by the difference between
--			 * max and min values scaled from the approximate size of the
--			 * screen to fit one meter.
--			 */
- 			if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, local->history_size, Absolute) == FALSE) {
- 				ErrorF("Unable to allocate Fpit touchscreen ValuatorClassDeviceStruct\n");
- 				return !Success;
--			} else {
--				InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
--						       9500 /* max_res */ );
--				InitValuatorAxisStruct(dev, 1, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
--						       10500 /* max_res */ );
- 			}
-+			xf86FpitSetUpAxes(dev, priv);
- 
- 			if (InitFocusClassDeviceStruct(dev) == FALSE) {
- 				ErrorF("Unable to allocate Fpit touchscreen FocusClassDeviceStruct\n");
-@@ -451,6 +519,7 @@ static LocalDevicePtr xf86FpitAllocate(I
- 	priv->screen_no = 0;
- 	priv->screen_width = -1;
- 	priv->screen_height = -1;
-+	priv->screen_rotation = RR_Rotate_0;
- 	priv->fpitMinX = FPIT_MIN_X;
- 	priv->fpitMaxX = FPIT_MAX_X;
- 	priv->fpitMinY = FPIT_MIN_Y;
-@@ -459,7 +528,6 @@ static LocalDevicePtr xf86FpitAllocate(I
- 	priv->fpitOldButtons = 0;
- 	priv->fpitOldProximity = 0;
- 	priv->fpitIndex = 0;
--	priv->fpitSwapXY = 0;
- 	priv->fpitPassive = 0;
- 	local->name = XI_TOUCHSCREEN;
- 	local->flags = 0 /* XI86_NO_OPEN_ON_INIT */ ;
-@@ -533,29 +601,33 @@ static InputInfoPtr xf86FpitInit(InputDr
- 	xf86Msg(X_CONFIG, "FPIT maximum y position: %d\n", priv->fpitMaxY);
- 	priv->fpitMinY = xf86SetIntOption(local->options, "MinimumYPosition", FPIT_MIN_Y);
- 	xf86Msg(X_CONFIG, "FPIT minimum y position: %d\n", priv->fpitMinY);
--	priv->fpitInvX = xf86SetBoolOption(local->options, "InvertX", 0);
--	priv->fpitInvY = xf86SetBoolOption(local->options, "InvertY", 0);
--	priv->fpitSwapXY = xf86SetBoolOption(local->options, "SwapXY", 0);
-+
-+	priv->fpitBaseOrientation = 0;
-+	if (xf86SetBoolOption(local->options, "InvertX", 0))
-+		priv->fpitBaseOrientation |= FPIT_INVERT_X;
-+	if (xf86SetBoolOption(local->options, "InvertY", 0))
-+		priv->fpitBaseOrientation |= FPIT_INVERT_Y;
-+	if (xf86SetBoolOption(local->options, "SwapXY", 0))
-+		priv->fpitBaseOrientation |= FPIT_THEN_SWAP_XY;
- 	priv->fpitPassive = xf86SetBoolOption(local->options, "Passive", 0);
-+	priv->fpitTrackRandR = xf86SetBoolOption(local->options, "TrackRandR", 0);
-+	/* XXX "Rotate" option provides compatibly stupid behavior. JEB. */
- 	str = xf86SetStrOption(local->options, "Rotate", 0);
--	if (!xf86NameCmp(str, "CW")) {
--		priv->fpitInvX = 1;
--		priv->fpitInvY = 1;
--		priv->fpitSwapXY = 1;
--	} else if (!xf86NameCmp(str, "CCW")) {
--		priv->fpitInvX = 0;
--		priv->fpitInvY = 0;
--		priv->fpitSwapXY = 1;
--	}
--	xf86Msg(X_CONFIG, "FPIT invert X axis: %s\n", priv->fpitInvX ? "Yes" : "No");
--	xf86Msg(X_CONFIG, "FPIT invert Y axis: %s\n", priv->fpitInvY ? "Yes" : "No");
--	xf86Msg(X_CONFIG, "FPIT swap X and Y axis: %s\n", priv->fpitSwapXY ? "Yes" : "No");
-+	if (!xf86NameCmp(str, "CW"))
-+		priv->fpitBaseOrientation |= FPIT_INVERT_X | FPIT_INVERT_Y | FPIT_THEN_SWAP_XY;
-+	else if (!xf86NameCmp(str, "CCW"))
-+		priv->fpitBaseOrientation |= FPIT_THEN_SWAP_XY;
-+	xf86Msg(X_CONFIG, "FPIT invert X axis: %s\n", priv->fpitBaseOrientation & FPIT_INVERT_X ? "Yes" : "No");
-+	xf86Msg(X_CONFIG, "FPIT invert Y axis: %s\n", priv->fpitBaseOrientation & FPIT_INVERT_Y ? "Yes" : "No");
-+	xf86Msg(X_CONFIG, "FPIT swap X and Y axis: %s\n", priv->fpitBaseOrientation & FPIT_THEN_SWAP_XY ? "Yes" : "No");
- 	xf86Msg(X_CONFIG, "FPIT Passive button mode: %s\n", priv->fpitPassive ? "Yes" : "No");
-+	xf86Msg(X_CONFIG, "FPIT RandR tracking: %s\n", priv->fpitTrackRandR ? "Yes" : "No");
- 	/* mark the device configured */
- 	local->flags |= XI86_CONFIGURED;
- 	return local;
- }
- 
-+
- _X_EXPORT InputDriverRec FPIT = {
- 	1,			/* driver version */
- 	"fpit",			/* driver name */
diff --git a/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.1.0-r1.ebuild b/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.1.0-r1.ebuild
deleted file mode 100644
index 8abd2ee54283..000000000000
--- a/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.1.0-r1.ebuild,v 1.9 2009/09/30 21:19:43 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Fujitsu Stylistic input driver"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
-
-PATCHES=( "${FILESDIR}/${PN}-update1.diff"
-	"${FILESDIR}/${PN}-update2.diff"
-	"${FILESDIR}/${PN}-update3.diff" )
diff --git a/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.2.0.ebuild b/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.2.0.ebuild
deleted file mode 100644
index 81f05accb0d3..000000000000
--- a/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.2.0.ebuild,v 1.8 2009/09/30 21:19:43 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Fujitsu Stylistic input driver"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-hyperpen/ChangeLog b/x11-drivers/xf86-input-hyperpen/ChangeLog
index 0bdfd09ec40a..f60aad3225e4 100644
--- a/x11-drivers/xf86-input-hyperpen/ChangeLog
+++ b/x11-drivers/xf86-input-hyperpen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-hyperpen
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-hyperpen/ChangeLog,v 1.48 2009/12/15 19:26:10 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-hyperpen/ChangeLog,v 1.49 2010/01/23 19:44:33 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-hyperpen-1.1.0.ebuild, -xf86-input-hyperpen-1.2.0.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org>
   xf86-input-hyperpen-1.3.0.ebuild:
diff --git a/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.1.0.ebuild b/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.1.0.ebuild
deleted file mode 100644
index 37f151520f5d..000000000000
--- a/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.1.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.1.0.ebuild,v 1.9 2006/10/13 23:15:48 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for hyperpen input devices"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.2.0.ebuild b/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.2.0.ebuild
deleted file mode 100644
index 075d30aefe8d..000000000000
--- a/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.2.0.ebuild,v 1.7 2009/05/15 15:54:00 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for hyperpen input devices"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-keyboard/ChangeLog b/x11-drivers/xf86-input-keyboard/ChangeLog
index f2d4c786c389..dd19784150b3 100644
--- a/x11-drivers/xf86-input-keyboard/ChangeLog
+++ b/x11-drivers/xf86-input-keyboard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-keyboard
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/ChangeLog,v 1.73 2010/01/18 19:35:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/ChangeLog,v 1.74 2010/01/23 19:46:17 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-keyboard-1.3.2.ebuild:
+  rm
 
   18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   xf86-input-keyboard-1.4.0.ebuild:
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.3.2.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.3.2.ebuild
deleted file mode 100644
index f3f5fa35d258..000000000000
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.3.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.3.2.ebuild,v 1.10 2009/06/23 20:00:49 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER="4"
-
-inherit x-modular
-
-DESCRIPTION="Keyboard input driver"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.3.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-mouse/ChangeLog b/x11-drivers/xf86-input-mouse/ChangeLog
index 8cd3f0d69343..33184718ae09 100644
--- a/x11-drivers/xf86-input-mouse/ChangeLog
+++ b/x11-drivers/xf86-input-mouse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-mouse
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/ChangeLog,v 1.89 2010/01/18 19:35:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/ChangeLog,v 1.90 2010/01/23 19:47:51 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-mouse-1.4.0.ebuild:
+  rm
 
   18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   xf86-input-mouse-1.5.0.ebuild:
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.4.0.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.4.0.ebuild
deleted file mode 100644
index 83c1414b07d4..000000000000
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.4.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.4.0.ebuild,v 1.10 2009/06/23 19:58:06 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for mouse input devices"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-mutouch/ChangeLog b/x11-drivers/xf86-input-mutouch/ChangeLog
index c06a4231fc45..7016670d3724 100644
--- a/x11-drivers/xf86-input-mutouch/ChangeLog
+++ b/x11-drivers/xf86-input-mutouch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-mutouch
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mutouch/ChangeLog,v 1.42 2009/12/15 19:27:26 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mutouch/ChangeLog,v 1.43 2010/01/23 19:51:39 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-mutouch-1.1.0.ebuild, -xf86-input-mutouch-1.2.0.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org>
   xf86-input-mutouch-1.2.1.ebuild:
diff --git a/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.1.0.ebuild b/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.1.0.ebuild
deleted file mode 100644
index 051cd35c67a6..000000000000
--- a/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.1.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.1.0.ebuild,v 1.8 2006/10/13 23:15:48 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Microtouch input driver"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.2.0.ebuild b/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.2.0.ebuild
deleted file mode 100644
index 1f8d99a7925f..000000000000
--- a/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.2.0.ebuild,v 1.1 2008/03/24 04:09:03 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Microtouch input driver"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-penmount/ChangeLog b/x11-drivers/xf86-input-penmount/ChangeLog
index a01a601229de..31d6f95772c8 100644
--- a/x11-drivers/xf86-input-penmount/ChangeLog
+++ b/x11-drivers/xf86-input-penmount/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-penmount
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-penmount/ChangeLog,v 1.56 2009/12/15 19:27:45 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-penmount/ChangeLog,v 1.57 2010/01/23 19:53:10 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-penmount-1.2.0.ebuild, -xf86-input-penmount-1.3.0.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org>
   xf86-input-penmount-1.4.0.ebuild:
diff --git a/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.2.0.ebuild b/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.2.0.ebuild
deleted file mode 100644
index 4e6419e5e1a9..000000000000
--- a/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.2.0.ebuild,v 1.11 2007/09/08 21:45:02 josejx Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="PenMount input driver"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.3.0.ebuild b/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.3.0.ebuild
deleted file mode 100644
index b0864306beb2..000000000000
--- a/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.3.0.ebuild,v 1.7 2009/05/15 16:09:22 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER="4"
-
-inherit x-modular
-
-DESCRIPTION="PenMount input driver"
-
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-1.4.1
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index 82e11346a129..33bdb4925816 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-synaptics
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.40 2009/12/27 18:00:52 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.41 2010/01/23 19:54:57 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-synaptics-1.0.0.ebuild, -xf86-input-synaptics-1.1.3.ebuild:
+  rm
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org>
   xf86-input-synaptics-1.2.0.ebuild:
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild
deleted file mode 100644
index ad9679148940..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild,v 1.7 2009/09/16 08:13:53 remi Exp $
-
-inherit toolchain-funcs eutils x-modular
-
-DESCRIPTION="Driver for Synaptics touchpads"
-HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
-KEYWORDS="amd64 ppc ppc64 x86"
-LICENSE="MIT"
-IUSE="hal"
-RDEPEND="x11-libs/libXext
-	 hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
-	!x11-drivers/synaptics
-	x11-base/xorg-server
-	x11-proto/inputproto
-	>=sys-apps/sed-4"
-
-src_install() {
-	DOCS="INSTALL NEWS TODO README"
-	x-modular_src_install
-
-	if use hal ; then
-		insinto /usr/share/hal/fdi/policy/10osvendor
-		doins "${S}"/fdi/11-x11-synaptics.fdi
-	fi
-}
-
-pkg_postinst() {
-	elog "This driver requires event interface support in your kernel: INPUT_EVDEV"
-	if use hal ; then
-		elog "Synaptics settings are now stored in:"
-		elog "/etc/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
-		echo
-		ewarn "Please see the examples here for inspiration, but not edit:"
-		ewarn "/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
-	fi
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.3.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.3.ebuild
deleted file mode 100644
index aa6478bc1908..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.3.ebuild,v 1.5 2009/10/11 11:23:27 nixnut Exp $
-
-inherit toolchain-funcs eutils x-modular
-
-DESCRIPTION="Driver for Synaptics touchpads"
-HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-LICENSE="MIT"
-IUSE="hal"
-RDEPEND="x11-libs/libXext
-	x11-libs/libXtst
-	hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
-	!x11-drivers/synaptics
-	x11-base/xorg-server
-	x11-proto/inputproto
-	>=sys-apps/sed-4"
-
-# Needs to be rebuild when migrating to xorg-server 1.6 to enable properties
-# support
-src_install() {
-	DOCS="INSTALL NEWS TODO README"
-	x-modular_src_install
-
-	if use hal ; then
-		insinto /usr/share/hal/fdi/policy/10osvendor
-		doins "${S}"/fdi/11-x11-synaptics.fdi
-	fi
-}
-
-pkg_postinst() {
-	elog "This driver requires event interface support in your kernel: INPUT_EVDEV"
-	if use hal ; then
-		elog "Synaptics settings are now stored in:"
-		elog "/etc/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
-		echo
-		ewarn "Please see the examples here for inspiration, but not edit:"
-		ewarn "/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
-	fi
-}
diff --git a/x11-drivers/xf86-input-vmmouse/ChangeLog b/x11-drivers/xf86-input-vmmouse/ChangeLog
index 481b8d7e8a5f..01f43396d2d0 100644
--- a/x11-drivers/xf86-input-vmmouse/ChangeLog
+++ b/x11-drivers/xf86-input-vmmouse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-input-vmmouse
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/ChangeLog,v 1.30 2009/10/05 12:59:45 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/ChangeLog,v 1.31 2010/01/23 19:57:05 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-vmmouse-12.4.1.ebuild, -xf86-input-vmmouse-12.4.3.ebuild,
+  -xf86-input-vmmouse-12.5.0.ebuild, -xf86-input-vmmouse-12.6.3.ebuild,
+  -xf86-input-vmmouse-12.6.4.ebuild:
+  rm
 
   05 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
   xf86-input-vmmouse-12.6.5.ebuild:
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.4.1.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.4.1.ebuild
deleted file mode 100644
index f23b9c9bc1aa..000000000000
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.4.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.4.1.ebuild,v 1.3 2007/05/05 18:27:07 dang Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=2
-
-inherit x-modular
-
-DESCRIPTION="VMWare mouse input driver"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-0.99.3"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.4.3.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.4.3.ebuild
deleted file mode 100644
index 8169bd9d4e39..000000000000
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.4.3.ebuild,v 1.1 2007/11/07 09:18:16 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="VMWare mouse input driver"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-0.99.3"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-1.4.1
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.5.0.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.5.0.ebuild
deleted file mode 100644
index 95c9fc808049..000000000000
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.5.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.5.0.ebuild,v 1.1 2008/03/24 04:11:23 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="VMWare mouse input driver"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-0.99.3"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-1.4.1
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.6.3.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.6.3.ebuild
deleted file mode 100644
index 3045ed986d5c..000000000000
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.6.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.6.3.ebuild,v 1.3 2009/04/05 22:13:34 maekke Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="VMWare mouse input driver"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-0.99.3"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-1.4.1
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.6.4.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.6.4.ebuild
deleted file mode 100644
index f942a671d800..000000000000
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.6.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.6.4.ebuild,v 1.1 2009/08/03 17:44:47 remi Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="VMWare mouse input driver"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-0.99.3"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-1.4.1
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-input-void/ChangeLog b/x11-drivers/xf86-input-void/ChangeLog
index 7843c7202b30..ea00812303b4 100644
--- a/x11-drivers/xf86-input-void/ChangeLog
+++ b/x11-drivers/xf86-input-void/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-void
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-void/ChangeLog,v 1.54 2009/12/27 18:01:13 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-void/ChangeLog,v 1.55 2010/01/23 19:58:00 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-void-1.2.0.ebuild:
+  rm
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org> ChangeLog:
   Marked ppc stable for bug #294958.
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.2.0.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.2.0.ebuild
deleted file mode 100644
index b4af5fd282e4..000000000000
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-void/xf86-input-void-1.2.0.ebuild,v 1.10 2009/06/23 19:52:25 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER="4"
-
-inherit x-modular
-
-DESCRIPTION="null input driver"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-apm/ChangeLog b/x11-drivers/xf86-video-apm/ChangeLog
index e25a66f63e77..8ef53e0a12d0 100644
--- a/x11-drivers/xf86-video-apm/ChangeLog
+++ b/x11-drivers/xf86-video-apm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-apm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-apm/ChangeLog,v 1.35 2009/12/15 15:26:29 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-apm/ChangeLog,v 1.36 2010/01/23 19:59:08 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-apm-1.2.0.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-apm-1.2.2.ebuild:
diff --git a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.0.ebuild b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.0.ebuild
deleted file mode 100644
index edebed29ddc8..000000000000
--- a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.0.ebuild,v 1.6 2009/04/15 15:43:58 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Alliance ProMotion video driver"
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86rushproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-ark/ChangeLog b/x11-drivers/xf86-video-ark/ChangeLog
index cfdb04a020e5..e99938810c36 100644
--- a/x11-drivers/xf86-video-ark/ChangeLog
+++ b/x11-drivers/xf86-video-ark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-ark
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/ChangeLog,v 1.37 2010/01/18 19:37:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/ChangeLog,v 1.38 2010/01/23 20:00:15 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-ark-0.7.0.ebuild, -xf86-video-ark-0.7.1.ebuild:
+  rm
 
   18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   xf86-video-ark-0.7.2.ebuild:
diff --git a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.0.ebuild b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.0.ebuild
deleted file mode 100644
index 3a55d81f7abd..000000000000
--- a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.0.ebuild,v 1.5 2009/04/15 16:01:12 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for ark cards"
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.1.ebuild b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.1.ebuild
deleted file mode 100644
index 5dc5117bed0d..000000000000
--- a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.1.ebuild,v 1.5 2009/12/15 15:27:04 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for ark cards"
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-ast/ChangeLog b/x11-drivers/xf86-video-ast/ChangeLog
index b5edd2f5058b..498879f89878 100644
--- a/x11-drivers/xf86-video-ast/ChangeLog
+++ b/x11-drivers/xf86-video-ast/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-ast
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ast/ChangeLog,v 1.10 2009/10/05 13:11:05 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ast/ChangeLog,v 1.11 2010/01/23 20:01:13 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-ast-0.87.0.ebuild:
+  rm
 
   05 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
   xf86-video-ast-0.89.9.ebuild:
diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-0.87.0.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-0.87.0.ebuild
deleted file mode 100644
index 1c5f4d5e65ee..000000000000
--- a/x11-drivers/xf86-video-ast/xf86-video-ast-0.87.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ast/xf86-video-ast-0.87.0.ebuild,v 1.3 2009/04/05 22:15:02 maekke Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=-1
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for ASpeedTech cards"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-LICENSE="MIT"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-chips/ChangeLog b/x11-drivers/xf86-video-chips/ChangeLog
index 6cb4460bc424..66e192abf153 100644
--- a/x11-drivers/xf86-video-chips/ChangeLog
+++ b/x11-drivers/xf86-video-chips/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-chips
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-chips/ChangeLog,v 1.40 2009/12/27 18:02:35 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-chips/ChangeLog,v 1.41 2010/01/23 20:02:05 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-chips-1.2.1.ebuild:
+  rm
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org>
   xf86-video-chips-1.2.2.ebuild:
diff --git a/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.1.ebuild b/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.1.ebuild
deleted file mode 100644
index 25a4389453bd..000000000000
--- a/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.1.ebuild,v 1.7 2009/09/22 14:12:58 remi Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Chips and Technologies video driver"
-
-KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-cirrus/ChangeLog b/x11-drivers/xf86-video-cirrus/ChangeLog
index 93b00eff467e..69c66fb04310 100644
--- a/x11-drivers/xf86-video-cirrus/ChangeLog
+++ b/x11-drivers/xf86-video-cirrus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-cirrus
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/ChangeLog,v 1.36 2009/12/15 15:32:22 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/ChangeLog,v 1.37 2010/01/23 20:02:58 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-cirrus-1.1.0.ebuild, -xf86-video-cirrus-1.2.1.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-cirrus-1.3.2.ebuild:
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.1.0.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.1.0.ebuild
deleted file mode 100644
index 6aa8cf3282fe..000000000000
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.1.0.ebuild,v 1.7 2009/03/13 15:28:41 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Cirrus Logic video driver"
-KEYWORDS="alpha amd64 ia64 ppc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.2.1.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.2.1.ebuild
deleted file mode 100644
index d7ed106a3bd5..000000000000
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.2.1.ebuild,v 1.6 2009/06/23 19:55:48 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Cirrus Logic video driver"
-KEYWORDS="alpha amd64 ia64 ~ppc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-dummy/ChangeLog b/x11-drivers/xf86-video-dummy/ChangeLog
index 5c6d4406675f..f39175bd3a7c 100644
--- a/x11-drivers/xf86-video-dummy/ChangeLog
+++ b/x11-drivers/xf86-video-dummy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-dummy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/ChangeLog,v 1.53 2009/12/15 19:29:12 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/ChangeLog,v 1.54 2010/01/23 20:04:14 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-dummy-0.3.1.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org>
   xf86-video-dummy-0.3.2.ebuild:
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.1.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.1.ebuild
deleted file mode 100644
index f7f095006f1c..000000000000
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.1.ebuild,v 1.10 2009/06/23 19:56:34 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for dummy cards"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-fbdev/ChangeLog b/x11-drivers/xf86-video-fbdev/ChangeLog
index ce7a79bb07cc..970e73c04c36 100644
--- a/x11-drivers/xf86-video-fbdev/ChangeLog
+++ b/x11-drivers/xf86-video-fbdev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-fbdev
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/ChangeLog,v 1.62 2009/12/15 19:29:31 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/ChangeLog,v 1.63 2010/01/23 20:05:49 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-fbdev-0.4.0.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org>
   xf86-video-fbdev-0.4.1.ebuild:
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.0.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.0.ebuild
deleted file mode 100644
index 59331acd9f0f..000000000000
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.0.ebuild,v 1.11 2009/09/22 14:40:17 remi Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="video driver for framebuffer device"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-glint/ChangeLog b/x11-drivers/xf86-video-glint/ChangeLog
index 141d1a77ed40..39d5c56849d5 100644
--- a/x11-drivers/xf86-video-glint/ChangeLog
+++ b/x11-drivers/xf86-video-glint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-glint
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/ChangeLog,v 1.45 2009/12/15 15:34:38 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/ChangeLog,v 1.46 2010/01/23 20:07:01 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-glint-1.2.1.ebuild, -xf86-video-glint-1.2.2.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-glint-1.2.4.ebuild:
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.1.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.1.ebuild
deleted file mode 100644
index 1909edc39475..000000000000
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.1.ebuild,v 1.5 2009/05/04 16:30:00 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="GLINT/Permedia video driver"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2
-			x11-proto/glproto )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.2.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.2.ebuild
deleted file mode 100644
index c3da4a4b1e9f..000000000000
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.2.ebuild,v 1.8 2009/06/23 19:56:57 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="GLINT/Permedia video driver"
-KEYWORDS="alpha amd64 ia64 ppc ~sparc x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2
-			x11-proto/glproto )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-i128/ChangeLog b/x11-drivers/xf86-video-i128/ChangeLog
index 9fd0c78ae0b2..8800011ab9b5 100644
--- a/x11-drivers/xf86-video-i128/ChangeLog
+++ b/x11-drivers/xf86-video-i128/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-i128
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i128/ChangeLog,v 1.38 2009/12/15 15:35:12 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i128/ChangeLog,v 1.39 2010/01/23 20:07:53 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-i128-1.3.1.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-i128-1.3.3.ebuild:
diff --git a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.1.ebuild b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.1.ebuild
deleted file mode 100644
index 4e60aa27866a..000000000000
--- a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.1.ebuild,v 1.6 2009/09/22 16:09:07 remi Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Number 9 I128 video driver"
-
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-i740/ChangeLog b/x11-drivers/xf86-video-i740/ChangeLog
index 048488ffec1a..49f17a0de0a6 100644
--- a/x11-drivers/xf86-video-i740/ChangeLog
+++ b/x11-drivers/xf86-video-i740/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-i740
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/ChangeLog,v 1.31 2009/12/15 15:35:45 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/ChangeLog,v 1.32 2010/01/23 20:09:47 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-i740-1.1.0.ebuild, -xf86-video-i740-1.2.0.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-i740-1.3.2.ebuild:
diff --git a/x11-drivers/xf86-video-i740/xf86-video-i740-1.1.0.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.1.0.ebuild
deleted file mode 100644
index fd9ba0f6462c..000000000000
--- a/x11-drivers/xf86-video-i740/xf86-video-i740-1.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/xf86-video-i740-1.1.0.ebuild,v 1.7 2009/03/13 15:34:39 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Intel i740 video driver"
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-i740/xf86-video-i740-1.2.0.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.2.0.ebuild
deleted file mode 100644
index b560f8b7acae..000000000000
--- a/x11-drivers/xf86-video-i740/xf86-video-i740-1.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/xf86-video-i740-1.2.0.ebuild,v 1.4 2009/04/15 15:28:44 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Intel i740 video driver"
-KEYWORDS="~amd64 ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-ivtv/ChangeLog b/x11-drivers/xf86-video-ivtv/ChangeLog
index 8816f473a43f..5c6f46850615 100644
--- a/x11-drivers/xf86-video-ivtv/ChangeLog
+++ b/x11-drivers/xf86-video-ivtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-ivtv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/ChangeLog,v 1.10 2009/12/14 12:04:25 remi Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/ChangeLog,v 1.11 2010/01/23 20:12:24 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-ivtv-1.0.0.ebuild:
+  rm
 
   14 Dec 2009; Rémi Cardona <remi@gentoo.org> xf86-video-ivtv-1.0.0.ebuild,
   xf86-video-ivtv-1.0.1.ebuild:
diff --git a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.0.ebuild b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.0.ebuild
deleted file mode 100644
index dd48dfaeb75d..000000000000
--- a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.0.ebuild,v 1.6 2009/12/14 12:04:25 remi Exp $
-
-inherit flag-o-matic x-modular
-DESCRIPTION="X.Org driver for TV-out on ivtvdev cards"
-HOMEPAGE="http://ivtvdriver.org/"
-SRC_URI="http://dl.ivtvdriver.org/xf86-video-ivtv/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="x11-base/xorg-server
-		x11-misc/imake
-		|| ( media-tv/ivtv
-			media-tv/ivtv-utils )"
-RDEPEND="x11-proto/xextproto
-		x11-proto/videoproto
-		x11-proto/xproto
-		>=x11-base/xorg-server-1.1.1-r4"
-XDPVER="-1"
-src_compile() {
-
-	append-flags "-I/usr/src/linux/include"
-	x-modular_src_compile
-}
-
-src_install() {
-
-	x-modular_src_install
-	dodoc README || die "Failed to install doc"
-}
diff --git a/x11-drivers/xf86-video-mach64/ChangeLog b/x11-drivers/xf86-video-mach64/ChangeLog
index 16401aad96af..41ed5ba4f6b9 100644
--- a/x11-drivers/xf86-video-mach64/ChangeLog
+++ b/x11-drivers/xf86-video-mach64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-mach64
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/ChangeLog,v 1.17 2009/12/15 19:29:49 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/ChangeLog,v 1.18 2010/01/23 20:13:20 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-mach64-6.8.0.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org>
   xf86-video-mach64-6.8.2.ebuild:
diff --git a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild
deleted file mode 100644
index 1b87cb1a965a..000000000000
--- a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild,v 1.11 2009/12/14 12:06:55 remi Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="ATI Mach64 video driver"
-
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2
-	!<x11-drivers/xf86-video-ati-6.9"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto
-	dri? ( x11-proto/glproto
-			x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-mga/ChangeLog b/x11-drivers/xf86-video-mga/ChangeLog
index a1ff68dec748..80b145ad757c 100644
--- a/x11-drivers/xf86-video-mga/ChangeLog
+++ b/x11-drivers/xf86-video-mga/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-mga
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/ChangeLog,v 1.82 2009/12/15 19:30:12 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/ChangeLog,v 1.83 2010/01/23 20:14:16 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-mga-1.4.9.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org> xf86-video-mga-1.4.11.ebuild:
   Marking xf86-video-mga-1.4.11 ppc64 stable for bug 294958
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild
deleted file mode 100644
index c356ffe7a7ac..000000000000
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild,v 1.11 2009/06/23 19:57:43 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Matrox video driver"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.4"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			x11-proto/glproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-neomagic/ChangeLog b/x11-drivers/xf86-video-neomagic/ChangeLog
index f23f0732f7ff..f8776f048bcd 100644
--- a/x11-drivers/xf86-video-neomagic/ChangeLog
+++ b/x11-drivers/xf86-video-neomagic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-neomagic
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/ChangeLog,v 1.34 2009/12/15 15:39:54 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/ChangeLog,v 1.35 2010/01/23 20:15:27 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-neomagic-1.1.1.ebuild, -xf86-video-neomagic-1.2.1.ebuild,
+  -xf86-video-neomagic-1.2.2.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-neomagic-1.2.4.ebuild:
diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.1.1.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.1.1.ebuild
deleted file mode 100644
index 2b7d4f72e5ea..000000000000
--- a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.1.1.ebuild,v 1.7 2009/03/13 15:38:12 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Neomagic video driver"
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.1.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.1.ebuild
deleted file mode 100644
index ebbecaadf5fa..000000000000
--- a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.1.ebuild,v 1.2 2009/03/13 15:38:12 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Neomagic video driver"
-KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.2.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.2.ebuild
deleted file mode 100644
index ab89fa3fc9c8..000000000000
--- a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.2.ebuild,v 1.5 2009/04/15 15:35:27 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Neomagic video driver"
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-nsc/ChangeLog b/x11-drivers/xf86-video-nsc/ChangeLog
index 012d2ff21b32..7047ca75915e 100644
--- a/x11-drivers/xf86-video-nsc/ChangeLog
+++ b/x11-drivers/xf86-video-nsc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-nsc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nsc/ChangeLog,v 1.29 2009/10/05 13:50:31 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nsc/ChangeLog,v 1.30 2010/01/23 20:16:47 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-nsc-2.8.1.ebuild, -xf86-video-nsc-2.8.2.ebuild:
+  rm
 
   05 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
   xf86-video-nsc-2.8.3.ebuild:
diff --git a/x11-drivers/xf86-video-nsc/xf86-video-nsc-2.8.1.ebuild b/x11-drivers/xf86-video-nsc/xf86-video-nsc-2.8.1.ebuild
deleted file mode 100644
index c4175bd40681..000000000000
--- a/x11-drivers/xf86-video-nsc/xf86-video-nsc-2.8.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nsc/xf86-video-nsc-2.8.1.ebuild,v 1.7 2009/09/30 21:03:21 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Nsc video driver"
-KEYWORDS="x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-nsc/xf86-video-nsc-2.8.2.ebuild b/x11-drivers/xf86-video-nsc/xf86-video-nsc-2.8.2.ebuild
deleted file mode 100644
index 36677fe8d131..000000000000
--- a/x11-drivers/xf86-video-nsc/xf86-video-nsc-2.8.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nsc/xf86-video-nsc-2.8.2.ebuild,v 1.6 2009/09/30 21:03:21 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Nsc video driver"
-KEYWORDS="x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-nv/ChangeLog b/x11-drivers/xf86-video-nv/ChangeLog
index 89b6e0ff6871..d8c6f051d24f 100644
--- a/x11-drivers/xf86-video-nv/ChangeLog
+++ b/x11-drivers/xf86-video-nv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-nv
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nv/ChangeLog,v 1.91 2010/01/18 19:41:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nv/ChangeLog,v 1.92 2010/01/23 20:18:08 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-nv-2.1.14.ebuild:
+  rm
 
   18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   xf86-video-nv-2.1.15.ebuild:
diff --git a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.14.ebuild b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.14.ebuild
deleted file mode 100644
index a1f55ebabf8f..000000000000
--- a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.14.ebuild,v 1.6 2009/12/15 15:40:34 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Nvidia video driver"
-
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-base/xorg-server"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-r128/ChangeLog b/x11-drivers/xf86-video-r128/ChangeLog
index 4e21261d18b5..e95bc4741192 100644
--- a/x11-drivers/xf86-video-r128/ChangeLog
+++ b/x11-drivers/xf86-video-r128/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-r128
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/ChangeLog,v 1.18 2009/12/15 19:30:55 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/ChangeLog,v 1.19 2010/01/23 20:19:37 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-r128-6.8.0.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org> xf86-video-r128-6.8.1.ebuild:
   Marking xf86-video-r128-6.8.1 ppc64 stable for bug 294958
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild
deleted file mode 100644
index e31712f70ccf..000000000000
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild,v 1.13 2009/12/14 12:45:18 remi Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="ATI Rage128 video driver"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2
-	!<x11-drivers/xf86-video-ati-6.9"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto
-	dri? ( x11-proto/glproto
-			x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-rendition/ChangeLog b/x11-drivers/xf86-video-rendition/ChangeLog
index e5ed79be13fb..cdc5072862e3 100644
--- a/x11-drivers/xf86-video-rendition/ChangeLog
+++ b/x11-drivers/xf86-video-rendition/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-rendition
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-rendition/ChangeLog,v 1.47 2010/01/18 19:42:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-rendition/ChangeLog,v 1.48 2010/01/23 20:21:15 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-rendition-4.2.0.ebuild, -xf86-video-rendition-4.2.1.ebuild,
+  -xf86-video-rendition-4.2.2.ebuild:
+  rm
 
   18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   xf86-video-rendition-4.2.3.ebuild:
diff --git a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.0.ebuild b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.0.ebuild
deleted file mode 100644
index 9d5ed4a618ce..000000000000
--- a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.0.ebuild,v 1.6 2009/10/03 11:52:16 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Rendition video driver"
-KEYWORDS="~alpha amd64 ia64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.1.ebuild b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.1.ebuild
deleted file mode 100644
index 6fd61046dc88..000000000000
--- a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.1.ebuild,v 1.4 2009/10/03 11:52:16 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Rendition video driver"
-KEYWORDS="alpha ~amd64 ~ia64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.2.ebuild b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.2.ebuild
deleted file mode 100644
index e590edb24b44..000000000000
--- a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.2.ebuild,v 1.5 2009/12/15 15:41:49 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Rendition video driver"
-KEYWORDS="alpha amd64 ia64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-s3/ChangeLog b/x11-drivers/xf86-video-s3/ChangeLog
index 0febda6ad22e..a1bfc2e8d025 100644
--- a/x11-drivers/xf86-video-s3/ChangeLog
+++ b/x11-drivers/xf86-video-s3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-s3
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/ChangeLog,v 1.44 2009/12/15 15:42:27 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/ChangeLog,v 1.45 2010/01/23 20:22:10 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-s3-0.6.0.ebuild, -xf86-video-s3-0.6.1.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org> xf86-video-s3-0.6.3.ebuild:
   alpha/ia64 stable wrt #282290
diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.0.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.0.ebuild
deleted file mode 100644
index e62384138384..000000000000
--- a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.0.ebuild,v 1.5 2009/04/15 16:00:11 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for s3 cards"
-KEYWORDS="~alpha amd64 ia64 ~ppc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.1.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.1.ebuild
deleted file mode 100644
index 41e9868fd65e..000000000000
--- a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.1.ebuild,v 1.3 2009/06/23 20:09:27 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for s3 cards"
-KEYWORDS="alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-s3virge/ChangeLog b/x11-drivers/xf86-video-s3virge/ChangeLog
index 20e8a7f03734..12679d3a53e6 100644
--- a/x11-drivers/xf86-video-s3virge/ChangeLog
+++ b/x11-drivers/xf86-video-s3virge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-s3virge
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/ChangeLog,v 1.37 2009/12/15 15:43:06 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/ChangeLog,v 1.38 2010/01/23 20:23:24 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-s3virge-1.9.1.ebuild, -xf86-video-s3virge-1.10.1.ebuild,
+  -xf86-video-s3virge-1.10.2.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-s3virge-1.10.4.ebuild:
diff --git a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.1.ebuild b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.1.ebuild
deleted file mode 100644
index 73d601888cbc..000000000000
--- a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.1.ebuild,v 1.5 2009/04/15 15:54:34 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="S3 ViRGE video driver"
-KEYWORDS="~alpha amd64 ia64 ~ppc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.2.ebuild b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.2.ebuild
deleted file mode 100644
index bf39b7606188..000000000000
--- a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.2.ebuild,v 1.3 2009/06/23 19:54:41 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="S3 ViRGE video driver"
-KEYWORDS="alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.9.1.ebuild b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.9.1.ebuild
deleted file mode 100644
index 72834242fa9d..000000000000
--- a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.9.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.9.1.ebuild,v 1.7 2009/03/13 15:59:58 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="S3 ViRGE video driver"
-KEYWORDS="alpha amd64 ia64 ppc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-savage/ChangeLog b/x11-drivers/xf86-video-savage/ChangeLog
index ea8af59c45cd..bdf03f272143 100644
--- a/x11-drivers/xf86-video-savage/ChangeLog
+++ b/x11-drivers/xf86-video-savage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-savage
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.55 2009/12/15 15:43:44 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.56 2010/01/23 20:24:26 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-savage-2.2.1.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-savage-2.3.1.ebuild:
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild
deleted file mode 100644
index 5481c6184640..000000000000
--- a/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild,v 1.10 2009/06/23 20:00:25 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER="4"
-
-inherit x-modular
-
-DESCRIPTION="S3 Savage video driver"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-siliconmotion/ChangeLog b/x11-drivers/xf86-video-siliconmotion/ChangeLog
index 392d6a437b0f..1b0a79495b22 100644
--- a/x11-drivers/xf86-video-siliconmotion/ChangeLog
+++ b/x11-drivers/xf86-video-siliconmotion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-siliconmotion
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/ChangeLog,v 1.43 2009/12/15 15:44:20 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/ChangeLog,v 1.44 2010/01/23 20:25:27 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-siliconmotion-1.6.0.ebuild,
+  -xf86-video-siliconmotion-1.7.0.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-siliconmotion-1.7.3.ebuild:
diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.6.0.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.6.0.ebuild
deleted file mode 100644
index e86a61837984..000000000000
--- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.6.0.ebuild,v 1.5 2009/04/15 15:58:56 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Silicon Motion video driver"
-KEYWORDS="~alpha amd64 ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.0.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.0.ebuild
deleted file mode 100644
index bd78a9edb59e..000000000000
--- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.0.ebuild,v 1.3 2009/06/23 20:07:23 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Silicon Motion video driver"
-KEYWORDS="alpha ~amd64 ~ia64 ~x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-sis/ChangeLog b/x11-drivers/xf86-video-sis/ChangeLog
index 99a276593804..c6daeecfc047 100644
--- a/x11-drivers/xf86-video-sis/ChangeLog
+++ b/x11-drivers/xf86-video-sis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-sis
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/ChangeLog,v 1.45 2009/12/15 15:44:59 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/ChangeLog,v 1.46 2010/01/23 20:27:26 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/xf86-video-sis-assert.patch, -xf86-video-sis-0.9.1-r1.ebuild,
+  -xf86-video-sis-0.9.3.ebuild, -xf86-video-sis-0.9.4.ebuild,
+  -xf86-video-sis-0.10.0.ebuild, -xf86-video-sis-0.10.1.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-sis-0.10.2.ebuild:
diff --git a/x11-drivers/xf86-video-sis/files/xf86-video-sis-assert.patch b/x11-drivers/xf86-video-sis/files/xf86-video-sis-assert.patch
deleted file mode 100644
index a285d596174a..000000000000
--- a/x11-drivers/xf86-video-sis/files/xf86-video-sis-assert.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: xf86-video-sis/src/sis_dri.c
-===================================================================
-RCS file: /cvs/xorg/driver/xf86-video-sis/src/sis_dri.c,v
-retrieving revision 1.26
-diff -u -B -r1.26 sis_dri.c
---- xf86-video-sis/src/sis_dri.c	21 Oct 2005 18:40:19 -0000	1.26
-+++ xf86-video-sis/src/sis_dri.c	6 Jun 2006 15:15:53 -0000
-@@ -1,5 +1,5 @@
- /* $XFree86$ */
--/* $XdotOrg: driver/xf86-video-sis/src/sis_dri.c,v 1.26 2005/10/21 18:40:19 ajax Exp $ */
-+/* $XdotOrg$ */
- /*
-  * DRI wrapper for 300 and 315 series
-  *
-@@ -40,6 +40,8 @@
- #include "config.h"
- #endif
- 
-+#include <assert.h>
-+
- #include "sis.h"
- #include "sis_regs.h"
- 
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild
deleted file mode 100644
index 358125ba25fb..000000000000
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild,v 1.7 2009/08/21 06:43:38 scarabeus Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="SiS and XGI video driver"
-KEYWORDS="amd64 ~ia64 ~ppc x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
-	!dri? ( x11-base/xorg-server )
-"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	dri? (
-		x11-proto/xf86driproto
-		>=x11-libs/libdrm-2
-	)"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild
deleted file mode 100644
index bc6d47ddb733..000000000000
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild,v 1.4 2009/08/21 06:43:38 scarabeus Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="SiS and XGI video driver"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
-	!dri? ( x11-base/xorg-server )
-"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	dri? (
-		x11-proto/xf86driproto
-		>=x11-libs/libdrm-2
-	)"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild
deleted file mode 100644
index 53e1133fe8dd..000000000000
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild,v 1.9 2009/08/21 06:43:38 scarabeus Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="SiS and XGI video driver"
-KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
-	!dri? ( x11-base/xorg-server )
-"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	dri? (
-		x11-proto/xf86driproto
-		>=x11-libs/libdrm-2
-	)"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-assert.patch"
-)
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild
deleted file mode 100644
index 69a177001ed9..000000000000
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild,v 1.10 2009/08/21 06:43:38 scarabeus Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="SiS and XGI video driver"
-KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
-	!dri? ( x11-base/xorg-server )
-"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	dri? (
-		x11-proto/xf86driproto
-		>=x11-libs/libdrm-2
-	)"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild
deleted file mode 100644
index e59a7fc03d28..000000000000
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild,v 1.7 2009/08/21 06:43:38 scarabeus Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="SiS and XGI video driver"
-KEYWORDS="~amd64 ~ia64 ~ppc x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
-	!dri? ( x11-base/xorg-server )
-"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	dri? (
-		x11-proto/xf86driproto
-		>=x11-libs/libdrm-2
-	)"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-sisusb/ChangeLog b/x11-drivers/xf86-video-sisusb/ChangeLog
index 14b4a036e190..5b6ba3e63ce5 100644
--- a/x11-drivers/xf86-video-sisusb/ChangeLog
+++ b/x11-drivers/xf86-video-sisusb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-sisusb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sisusb/ChangeLog,v 1.44 2009/12/15 19:31:35 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sisusb/ChangeLog,v 1.45 2010/01/23 20:29:13 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-sisusb-0.8.1.ebuild, -xf86-video-sisusb-0.9.0.ebuild,
+  -xf86-video-sisusb-0.9.1.ebuild:
+  rm
 
   15 Dec 2009; Brent Baude <ranger@gentoo.org>
   xf86-video-sisusb-0.9.3.ebuild:
diff --git a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.8.1.ebuild b/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.8.1.ebuild
deleted file mode 100644
index 8ea2e27816cb..000000000000
--- a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.8.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.8.1.ebuild,v 1.6 2006/10/13 23:15:49 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="SiS USB video driver"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xineramaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.0.ebuild b/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.0.ebuild
deleted file mode 100644
index 5d3e67106d1b..000000000000
--- a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.0.ebuild,v 1.6 2009/05/15 16:02:04 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="SiS USB video driver"
-KEYWORDS="~alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xineramaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.1.ebuild b/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.1.ebuild
deleted file mode 100644
index 3f7ed2d136ef..000000000000
--- a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.1.ebuild,v 1.3 2009/06/23 20:01:12 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="SiS USB video driver"
-KEYWORDS="alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-src_unpack() {
-	x-modular_src_unpack
-	cd "${S}"
-	# This package relies on the define as xorg-server-1.6 has it, so
-	# sed it back to what xorg-server-1.5 uses
-	sed -i '/XF86_VERSION_NUMERIC/s:\([[:digit:]]\)):\1,0):' src/*.[ch]
-}
diff --git a/x11-drivers/xf86-video-sunffb/ChangeLog b/x11-drivers/xf86-video-sunffb/ChangeLog
index 632f0f8d496d..6c8e239255ee 100644
--- a/x11-drivers/xf86-video-sunffb/ChangeLog
+++ b/x11-drivers/xf86-video-sunffb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-sunffb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunffb/ChangeLog,v 1.24 2009/11/02 12:37:22 remi Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunffb/ChangeLog,v 1.25 2010/01/23 20:30:03 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-sunffb-1.1.0.ebuild:
+  rm
 
 *xf86-video-sunffb-1.2.1 (02 Nov 2009)
 
diff --git a/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.1.0.ebuild b/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.1.0.ebuild
deleted file mode 100644
index 6864966a7bc8..000000000000
--- a/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.1.0.ebuild,v 1.5 2009/05/04 16:18:25 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="SUNFFB video driver"
-KEYWORDS="-* sparc"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-sunleo/ChangeLog b/x11-drivers/xf86-video-sunleo/ChangeLog
index 2d8832a99847..6cd94856ffa1 100644
--- a/x11-drivers/xf86-video-sunleo/ChangeLog
+++ b/x11-drivers/xf86-video-sunleo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-sunleo
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunleo/ChangeLog,v 1.19 2009/04/06 18:27:23 bluebird Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunleo/ChangeLog,v 1.20 2010/01/23 20:31:36 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-sunleo-1.1.0.ebuild:
+  rm
 
   06 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
   xf86-video-sunleo-1.2.0.ebuild:
diff --git a/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.1.0.ebuild b/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.1.0.ebuild
deleted file mode 100644
index 99c648cfcf14..000000000000
--- a/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.1.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.1.0.ebuild,v 1.3 2006/10/11 00:27:00 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Leo video driver"
-KEYWORDS="-* sparc"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-tdfx/ChangeLog b/x11-drivers/xf86-video-tdfx/ChangeLog
index 53a58c083499..ca4f016a6671 100644
--- a/x11-drivers/xf86-video-tdfx/ChangeLog
+++ b/x11-drivers/xf86-video-tdfx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-tdfx
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/ChangeLog,v 1.54 2009/12/15 15:46:23 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/ChangeLog,v 1.55 2010/01/23 20:32:49 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-tdfx-1.3.0.ebuild, -xf86-video-tdfx-1.4.0.ebuild,
+  -xf86-video-tdfx-1.4.1.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-tdfx-1.4.3.ebuild:
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.3.0.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.3.0.ebuild
deleted file mode 100644
index 38485eab7b62..000000000000
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.3.0.ebuild,v 1.11 2009/05/04 16:06:24 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="3Dfx video driver"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.0.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.0.ebuild
deleted file mode 100644
index 90cc77dbb6c7..000000000000
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.0.ebuild,v 1.4 2009/05/04 16:06:24 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="3Dfx video driver"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.1.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.1.ebuild
deleted file mode 100644
index 629bea157d46..000000000000
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.1.ebuild,v 1.9 2009/06/23 20:06:36 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="3Dfx video driver"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-tga/ChangeLog b/x11-drivers/xf86-video-tga/ChangeLog
index 006eb2bb4e2e..dded95b23a8a 100644
--- a/x11-drivers/xf86-video-tga/ChangeLog
+++ b/x11-drivers/xf86-video-tga/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-tga
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tga/ChangeLog,v 1.33 2010/01/18 19:44:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tga/ChangeLog,v 1.34 2010/01/23 20:33:53 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-tga-1.2.0.ebuild:
+  rm
 
   18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   xf86-video-tga-1.2.1.ebuild:
diff --git a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.0.ebuild b/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.0.ebuild
deleted file mode 100644
index d5aa0dda4d1d..000000000000
--- a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.0.ebuild,v 1.7 2009/10/03 11:55:07 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for tga cards"
-KEYWORDS="alpha amd64 ia64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-trident/ChangeLog b/x11-drivers/xf86-video-trident/ChangeLog
index 1e5a7dc598ef..34b6288c2a7c 100644
--- a/x11-drivers/xf86-video-trident/ChangeLog
+++ b/x11-drivers/xf86-video-trident/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-trident
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/ChangeLog,v 1.45 2009/12/15 15:46:59 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/ChangeLog,v 1.46 2010/01/23 20:34:44 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-trident-1.3.1.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-trident-1.3.3.ebuild:
diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.1.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.1.ebuild
deleted file mode 100644
index 95b37a5ce002..000000000000
--- a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.1.ebuild,v 1.6 2009/04/15 15:34:05 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=3
-
-inherit x-modular
-
-DESCRIPTION="Trident video driver"
-KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-tseng/ChangeLog b/x11-drivers/xf86-video-tseng/ChangeLog
index 2e6d25816cc9..be137cb4590a 100644
--- a/x11-drivers/xf86-video-tseng/ChangeLog
+++ b/x11-drivers/xf86-video-tseng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-tseng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tseng/ChangeLog,v 1.42 2010/01/18 19:45:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tseng/ChangeLog,v 1.43 2010/01/23 20:35:54 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-tseng-1.2.1.ebuild, -xf86-video-tseng-1.2.2.ebuild:
+  rm
 
   18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   xf86-video-tseng-1.2.3.ebuild:
diff --git a/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.1.ebuild b/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.1.ebuild
deleted file mode 100644
index 5d0e6e37dde7..000000000000
--- a/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.1.ebuild,v 1.6 2009/10/03 11:57:24 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Tseng Labs video driver"
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.2.ebuild b/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.2.ebuild
deleted file mode 100644
index 94f230234b68..000000000000
--- a/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.2.ebuild,v 1.5 2009/12/15 15:47:39 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Tseng Labs video driver"
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-voodoo/ChangeLog b/x11-drivers/xf86-video-voodoo/ChangeLog
index c8ae19260c12..9b3c7c1a5383 100644
--- a/x11-drivers/xf86-video-voodoo/ChangeLog
+++ b/x11-drivers/xf86-video-voodoo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-voodoo
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-voodoo/ChangeLog,v 1.47 2009/12/15 15:49:50 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-voodoo/ChangeLog,v 1.48 2010/01/23 20:36:59 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-voodoo-1.1.1.ebuild, -xf86-video-voodoo-1.2.0.ebuild,
+  -xf86-video-voodoo-1.2.1.ebuild:
+  rm
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-voodoo-1.2.3.ebuild:
diff --git a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.1.1.ebuild b/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.1.1.ebuild
deleted file mode 100644
index fb7142f3baa8..000000000000
--- a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.1.1.ebuild,v 1.10 2009/09/30 21:21:01 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Voodoo video driver"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.0.ebuild b/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.0.ebuild
deleted file mode 100644
index bfd2959b001b..000000000000
--- a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.0.ebuild,v 1.5 2009/09/30 21:21:01 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Voodoo video driver"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.1.ebuild b/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.1.ebuild
deleted file mode 100644
index 3a8c956be0b3..000000000000
--- a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.1.ebuild,v 1.6 2009/09/30 21:21:01 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="Voodoo video driver"
-KEYWORDS="alpha ~amd64 ia64 ~ppc sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"