Pull old versions.

(Portage version: 2.1_pre2)

53 files changed, 55 insertions, 485 deletions

diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog
index cabc00057a35..d05fe92fee58 100644
--- a/x11-apps/xfs/ChangeLog
+++ b/x11-apps/xfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xfs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.14 2005/12/23 10:38:45 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.15 2005/12/26 21:09:51 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> -xfs-0.99.3.ebuild,
+  -xfs-1.0.0.ebuild:
+  Pull old versions.
 
 *xfs-1.0.1 (23 Dec 2005)
 
diff --git a/x11-apps/xfs/files/digest-xfs-0.99.3 b/x11-apps/xfs/files/digest-xfs-0.99.3
deleted file mode 100644
index a2d4a5436564..000000000000
--- a/x11-apps/xfs/files/digest-xfs-0.99.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2995737ceddc99d2f62b2cf835e92ff xfs-0.99.3.tar.bz2 139886
diff --git a/x11-apps/xfs/files/digest-xfs-1.0.0 b/x11-apps/xfs/files/digest-xfs-1.0.0
deleted file mode 100644
index 5653c9061b22..000000000000
--- a/x11-apps/xfs/files/digest-xfs-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb51b77f7df00b9a30c7bf743e4b43e2 xfs-1.0.0.tar.bz2 140830
diff --git a/x11-apps/xfs/xfs-0.99.3.ebuild b/x11-apps/xfs/xfs-0.99.3.ebuild
deleted file mode 100644
index fd865d03f3e8..000000000000
--- a/x11-apps/xfs/xfs-0.99.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/xfs-0.99.3.ebuild,v 1.1 2005/12/04 22:04:25 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xfs application"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
-IUSE="ipv6"
-RDEPEND="x11-libs/libFS
-	x11-libs/libXfont"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
-					--libdir=/etc"
-
-pkg_setup() {
-	enewgroup xfs 33
-	enewuser xfs 33 -1 /etc/X11/fs xfs
-}
-
-src_unpack() {
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	sed -i -e "s:^configdir =.*:configdir = \$(sysconfdir)/X11/fs:g" \
-		${S}/Makefile.am
-
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	insinto /etc/X11/fs
-	newins ${FILESDIR}/xfs.config config
-	newinitd ${FILESDIR}/xfs.start xfs
-	newconfd ${FILESDIR}/xfs.conf.d xfs
-}
diff --git a/x11-apps/xfs/xfs-1.0.0.ebuild b/x11-apps/xfs/xfs-1.0.0.ebuild
deleted file mode 100644
index 927a1ac6fe63..000000000000
--- a/x11-apps/xfs/xfs-1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/xfs-1.0.0.ebuild,v 1.1 2005/12/18 19:36:03 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xfs application"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
-IUSE="ipv6"
-RDEPEND="x11-libs/libFS
-	x11-libs/libXfont"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
-					--libdir=/etc"
-
-pkg_setup() {
-	enewgroup xfs 33
-	enewuser xfs 33 -1 /etc/X11/fs xfs
-}
-
-src_unpack() {
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	sed -i -e "s:^configdir =.*:configdir = \$(sysconfdir)/X11/fs:g" \
-		${S}/Makefile.am
-
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	insinto /etc/X11/fs
-	newins ${FILESDIR}/xfs.config config
-	newinitd ${FILESDIR}/xfs.start xfs
-	newconfd ${FILESDIR}/xfs.conf.d xfs
-}
diff --git a/x11-apps/xfsinfo/ChangeLog b/x11-apps/xfsinfo/ChangeLog
index 533ae4888b94..76b82cbe6576 100644
--- a/x11-apps/xfsinfo/ChangeLog
+++ b/x11-apps/xfsinfo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xfsinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfsinfo/ChangeLog,v 1.8 2005/12/23 10:38:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfsinfo/ChangeLog,v 1.9 2005/12/26 21:10:19 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xfsinfo-0.99.2.ebuild, -xfsinfo-1.0.0.ebuild:
+  Pull old versions.
 
 *xfsinfo-1.0.1 (23 Dec 2005)
 
diff --git a/x11-apps/xfsinfo/files/digest-xfsinfo-0.99.2 b/x11-apps/xfsinfo/files/digest-xfsinfo-0.99.2
deleted file mode 100644
index a5833be4ad83..000000000000
--- a/x11-apps/xfsinfo/files/digest-xfsinfo-0.99.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c801a0ab3c98d990cd819f186e527be xfsinfo-0.99.2.tar.bz2 73162
diff --git a/x11-apps/xfsinfo/files/digest-xfsinfo-1.0.0 b/x11-apps/xfsinfo/files/digest-xfsinfo-1.0.0
deleted file mode 100644
index 406686001992..000000000000
--- a/x11-apps/xfsinfo/files/digest-xfsinfo-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44a2f1bd0da2b20a0960ba3a96776017 xfsinfo-1.0.0.tar.bz2 74077
diff --git a/x11-apps/xfsinfo/xfsinfo-0.99.2.ebuild b/x11-apps/xfsinfo/xfsinfo-0.99.2.ebuild
deleted file mode 100644
index eeb82dd460c4..000000000000
--- a/x11-apps/xfsinfo/xfsinfo-0.99.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfsinfo/xfsinfo-0.99.2.ebuild,v 1.1 2005/12/04 22:03:54 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xfsinfo application"
-KEYWORDS="~mips ~sparc ~x86"
-RDEPEND="x11-libs/libX11
-	x11-libs/libFS"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xfsinfo/xfsinfo-1.0.0.ebuild b/x11-apps/xfsinfo/xfsinfo-1.0.0.ebuild
deleted file mode 100644
index b94cbe833661..000000000000
--- a/x11-apps/xfsinfo/xfsinfo-1.0.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfsinfo/xfsinfo-1.0.0.ebuild,v 1.1 2005/12/18 19:35:29 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xfsinfo application"
-KEYWORDS="~mips ~sparc ~x86"
-RDEPEND="x11-libs/libX11
-	x11-libs/libFS"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xfwp/ChangeLog b/x11-apps/xfwp/ChangeLog
index 86c4855a5a86..f26605f76332 100644
--- a/x11-apps/xfwp/ChangeLog
+++ b/x11-apps/xfwp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xfwp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfwp/ChangeLog,v 1.8 2005/12/23 10:39:05 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfwp/ChangeLog,v 1.9 2005/12/26 21:10:47 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xfwp-0.99.2.ebuild, -xfwp-1.0.0.ebuild:
+  Pull old versions.
 
 *xfwp-1.0.1 (23 Dec 2005)
 
diff --git a/x11-apps/xfwp/files/digest-xfwp-0.99.2 b/x11-apps/xfwp/files/digest-xfwp-0.99.2
deleted file mode 100644
index 788e1a750543..000000000000
--- a/x11-apps/xfwp/files/digest-xfwp-0.99.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 423b0aa95d5c0d6e1dc62a25c9455ab4 xfwp-0.99.2.tar.bz2 103315
diff --git a/x11-apps/xfwp/files/digest-xfwp-1.0.0 b/x11-apps/xfwp/files/digest-xfwp-1.0.0
deleted file mode 100644
index 5bdd4216a189..000000000000
--- a/x11-apps/xfwp/files/digest-xfwp-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a67663e5a39db57d062d51257ce745ff xfwp-1.0.0.tar.bz2 104287
diff --git a/x11-apps/xfwp/xfwp-0.99.2.ebuild b/x11-apps/xfwp/xfwp-0.99.2.ebuild
deleted file mode 100644
index cb342cb75c82..000000000000
--- a/x11-apps/xfwp/xfwp-0.99.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfwp/xfwp-0.99.2.ebuild,v 1.1 2005/12/04 22:04:53 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xfwp application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
-RDEPEND="x11-libs/libX11
-	x11-libs/libICE"
-DEPEND="${RDEPEND}
-	x11-proto/xproxymanagementprotocol"
diff --git a/x11-apps/xfwp/xfwp-1.0.0.ebuild b/x11-apps/xfwp/xfwp-1.0.0.ebuild
deleted file mode 100644
index ff5aa42ed5a6..000000000000
--- a/x11-apps/xfwp/xfwp-1.0.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfwp/xfwp-1.0.0.ebuild,v 1.1 2005/12/18 19:36:47 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xfwp application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
-RDEPEND="x11-libs/libX11
-	x11-libs/libICE"
-DEPEND="${RDEPEND}
-	x11-proto/xproxymanagementprotocol"
diff --git a/x11-apps/xgamma/ChangeLog b/x11-apps/xgamma/ChangeLog
index e02a1c1ffc93..7836fd5ca8dc 100644
--- a/x11-apps/xgamma/ChangeLog
+++ b/x11-apps/xgamma/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xgamma
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/ChangeLog,v 1.9 2005/12/23 10:39:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/ChangeLog,v 1.10 2005/12/26 21:11:25 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xgamma-0.99.2.ebuild, -xgamma-1.0.0.ebuild:
+  Pull old versions.
 
 *xgamma-1.0.1 (23 Dec 2005)
 
diff --git a/x11-apps/xgamma/files/digest-xgamma-0.99.2 b/x11-apps/xgamma/files/digest-xgamma-0.99.2
deleted file mode 100644
index ed0357eda88b..000000000000
--- a/x11-apps/xgamma/files/digest-xgamma-0.99.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2fa330b2f3f66564d31f6eb8b38cc1b xgamma-0.99.2.tar.bz2 73825
diff --git a/x11-apps/xgamma/files/digest-xgamma-1.0.0 b/x11-apps/xgamma/files/digest-xgamma-1.0.0
deleted file mode 100644
index 3fa8d1ddf787..000000000000
--- a/x11-apps/xgamma/files/digest-xgamma-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea296218386bb97d5243f19fb60e93cb xgamma-1.0.0.tar.bz2 74698
diff --git a/x11-apps/xgamma/xgamma-0.99.2.ebuild b/x11-apps/xgamma/xgamma-0.99.2.ebuild
deleted file mode 100644
index 9b633d3a9e2f..000000000000
--- a/x11-apps/xgamma/xgamma-0.99.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/xgamma-0.99.2.ebuild,v 1.1 2005/12/04 22:05:19 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xgamma application"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
-RDEPEND="x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgamma/xgamma-1.0.0.ebuild b/x11-apps/xgamma/xgamma-1.0.0.ebuild
deleted file mode 100644
index 6a4a366020c5..000000000000
--- a/x11-apps/xgamma/xgamma-1.0.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/xgamma-1.0.0.ebuild,v 1.1 2005/12/18 19:37:15 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xgamma application"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
-RDEPEND="x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgc/ChangeLog b/x11-apps/xgc/ChangeLog
index 348b65bc0f2e..6868b23a77f4 100644
--- a/x11-apps/xgc/ChangeLog
+++ b/x11-apps/xgc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xgc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgc/ChangeLog,v 1.8 2005/12/23 10:39:45 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgc/ChangeLog,v 1.9 2005/12/26 21:11:53 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> -xgc-0.99.2.ebuild,
+  -xgc-1.0.0.ebuild:
+  Pull old versions.
 
 *xgc-1.0.1 (23 Dec 2005)
 
diff --git a/x11-apps/xgc/files/digest-xgc-0.99.2 b/x11-apps/xgc/files/digest-xgc-0.99.2
deleted file mode 100644
index aea25c32898f..000000000000
--- a/x11-apps/xgc/files/digest-xgc-0.99.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 247841f01b9196d7ba0dae5f9e941a26 xgc-0.99.2.tar.bz2 127131
diff --git a/x11-apps/xgc/files/digest-xgc-1.0.0 b/x11-apps/xgc/files/digest-xgc-1.0.0
deleted file mode 100644
index e4a4ae873af3..000000000000
--- a/x11-apps/xgc/files/digest-xgc-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5cb676578961b7ec8a926647b7a2e5c0 xgc-1.0.0.tar.bz2 128233
diff --git a/x11-apps/xgc/xgc-0.99.2.ebuild b/x11-apps/xgc/xgc-0.99.2.ebuild
deleted file mode 100644
index cab08e7fd2a2..000000000000
--- a/x11-apps/xgc/xgc-0.99.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgc/xgc-0.99.2.ebuild,v 1.1 2005/12/04 22:05:46 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xgc application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
-IUSE="xprint"
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="$(use_enable xprint)"
-
-pkg_setup() {
-	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
-		die "Build x11-libs/libXaw with USE=xprint."
-	fi
-}
diff --git a/x11-apps/xgc/xgc-1.0.0.ebuild b/x11-apps/xgc/xgc-1.0.0.ebuild
deleted file mode 100644
index 1d27a27f0e95..000000000000
--- a/x11-apps/xgc/xgc-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgc/xgc-1.0.0.ebuild,v 1.1 2005/12/18 19:37:44 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xgc application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
-IUSE="xprint"
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="$(use_enable xprint)"
-
-pkg_setup() {
-	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
-		die "Build x11-libs/libXaw with USE=xprint."
-	fi
-}
diff --git a/x11-apps/xhost/ChangeLog b/x11-apps/xhost/ChangeLog
index b2b31a6f932a..b46527969aa3 100644
--- a/x11-apps/xhost/ChangeLog
+++ b/x11-apps/xhost/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xhost
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/ChangeLog,v 1.14 2005/12/18 19:38:27 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/ChangeLog,v 1.15 2005/12/26 21:12:22 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xhost-0.99.3.ebuild:
+  Pull old versions.
 
 *xhost-1.0.0 (18 Dec 2005)
 
diff --git a/x11-apps/xhost/files/digest-xhost-0.99.3 b/x11-apps/xhost/files/digest-xhost-0.99.3
deleted file mode 100644
index a99132459e01..000000000000
--- a/x11-apps/xhost/files/digest-xhost-0.99.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57dbd8de9bae4659e9e7ad8b8ad13d40 xhost-0.99.3.tar.bz2 84683
diff --git a/x11-apps/xhost/xhost-0.99.3.ebuild b/x11-apps/xhost/xhost-0.99.3.ebuild
deleted file mode 100644
index 6417150e3019..000000000000
--- a/x11-apps/xhost/xhost-0.99.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/xhost-0.99.3.ebuild,v 1.1 2005/12/04 22:06:19 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xhost application"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-IUSE="ipv6"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index d93b898dd450..35730d51e517 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.32 2005/12/26 10:36:44 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.33 2005/12/26 21:12:50 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xinit-0.99.4.ebuild, -xinit-1.0.0.ebuild:
+  Pull old versions.
 
   26 Dec 2005; Stefaan De Roeck <stefaan@gentoo.org> xinit-1.0.1.ebuild:
   Marked ~alpha
diff --git a/x11-apps/xinit/files/digest-xinit-0.99.4 b/x11-apps/xinit/files/digest-xinit-0.99.4
deleted file mode 100644
index f746745234ee..000000000000
--- a/x11-apps/xinit/files/digest-xinit-0.99.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb443db632476d4b2bd42e1558004267 xinit-0.99.4.tar.bz2 91094
diff --git a/x11-apps/xinit/files/digest-xinit-1.0.0 b/x11-apps/xinit/files/digest-xinit-1.0.0
deleted file mode 100644
index 5017f104bbff..000000000000
--- a/x11-apps/xinit/files/digest-xinit-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fbafaf085b60a29fc336db8dce766167 xinit-1.0.0.tar.bz2 92003
diff --git a/x11-apps/xinit/xinit-0.99.4.ebuild b/x11-apps/xinit/xinit-0.99.4.ebuild
deleted file mode 100644
index eb8db1441b34..000000000000
--- a/x11-apps/xinit/xinit-0.99.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-0.99.4.ebuild,v 1.1 2005/12/04 22:06:52 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-# This is enabled due to modified Makefile.am from the patches
-SNAPSHOT="yes"
-
-inherit x-modular pam
-
-DESCRIPTION="X.Org xinit application"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-RDEPEND="x11-libs/libX11
-		x11-wm/twm
-		x11-apps/xclock
-		x11-terms/xterm"
-DEPEND="${RDEPEND}"
-
-PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
-	${FILESDIR}/gentoo-startx-customization-0.99.4.patch"
-
-src_unpack() {
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" ${S}/Makefile.am
-
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-	exeinto /etc/X11
-	doexe ${FILESDIR}/chooser.sh ${FILESDIR}/startDM.sh
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Xsession
-	exeinto /etc/X11/xinit
-	doexe ${FILESDIR}/xinitrc
-	newinitd ${FILESDIR}/xdm.start xdm
-	newpamd ${FILESDIR}/xserver.pamd xserver
-}
diff --git a/x11-apps/xinit/xinit-1.0.0.ebuild b/x11-apps/xinit/xinit-1.0.0.ebuild
deleted file mode 100644
index 20d12c3d6c8a..000000000000
--- a/x11-apps/xinit/xinit-1.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.0.ebuild,v 1.1 2005/12/18 19:39:01 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-# This is enabled due to modified Makefile.am from the patches
-SNAPSHOT="yes"
-
-inherit x-modular pam
-
-DESCRIPTION="X.Org xinit application"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-RDEPEND="x11-libs/libX11
-		x11-wm/twm
-		x11-apps/xclock
-		x11-terms/xterm"
-DEPEND="${RDEPEND}"
-
-PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
-	${FILESDIR}/gentoo-startx-customization-0.99.4.patch"
-
-src_unpack() {
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" ${S}/Makefile.am
-
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-	exeinto /etc/X11
-	doexe ${FILESDIR}/chooser.sh ${FILESDIR}/startDM.sh
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Xsession
-	exeinto /etc/X11/xinit
-	doexe ${FILESDIR}/xinitrc
-	newinitd ${FILESDIR}/xdm.start xdm
-	newpamd ${FILESDIR}/xserver.pamd xserver
-}
diff --git a/x11-apps/xkbcomp/ChangeLog b/x11-apps/xkbcomp/ChangeLog
index 207ec3a96574..75673c470ec0 100644
--- a/x11-apps/xkbcomp/ChangeLog
+++ b/x11-apps/xkbcomp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xkbcomp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.17 2005/12/26 10:37:04 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.18 2005/12/26 21:13:18 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xkbcomp-0.99.2.ebuild, -xkbcomp-1.0.0.ebuild:
+  Pull old versions.
 
   26 Dec 2005; Stefaan De Roeck <stefaan@gentoo.org> xkbcomp-1.0.1.ebuild:
   Marked ~alpha
diff --git a/x11-apps/xkbcomp/files/digest-xkbcomp-0.99.2 b/x11-apps/xkbcomp/files/digest-xkbcomp-0.99.2
deleted file mode 100644
index 594e675132d0..000000000000
--- a/x11-apps/xkbcomp/files/digest-xkbcomp-0.99.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b6984a2cfb2eaf272fc39b0cdcd56e3 xkbcomp-0.99.2.tar.bz2 176458
diff --git a/x11-apps/xkbcomp/files/digest-xkbcomp-1.0.0 b/x11-apps/xkbcomp/files/digest-xkbcomp-1.0.0
deleted file mode 100644
index 006c7118447a..000000000000
--- a/x11-apps/xkbcomp/files/digest-xkbcomp-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2bee4c0bb3475d3ef07c035798fcae85 xkbcomp-1.0.0.tar.bz2 178482
diff --git a/x11-apps/xkbcomp/xkbcomp-0.99.2.ebuild b/x11-apps/xkbcomp/xkbcomp-0.99.2.ebuild
deleted file mode 100644
index dc5f169aa057..000000000000
--- a/x11-apps/xkbcomp/xkbcomp-0.99.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-0.99.2.ebuild,v 1.1 2005/12/04 22:07:18 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-DESCRIPTION="X.Org xkbcomp application"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	x-modular_src_install
-
-	dodir usr/$(get_libdir)/X11/xkb
-	dosym ../../../bin/xkbcomp /usr/$(get_libdir)/X11/xkb/xkbcomp
-}
diff --git a/x11-apps/xkbcomp/xkbcomp-1.0.0.ebuild b/x11-apps/xkbcomp/xkbcomp-1.0.0.ebuild
deleted file mode 100644
index f01ed54f4e84..000000000000
--- a/x11-apps/xkbcomp/xkbcomp-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.0.0.ebuild,v 1.1 2005/12/18 19:39:39 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-DESCRIPTION="X.Org xkbcomp application"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	x-modular_src_install
-
-	dodir usr/$(get_libdir)/X11/xkb
-	dosym ../../../bin/xkbcomp /usr/$(get_libdir)/X11/xkb/xkbcomp
-}
diff --git a/x11-apps/xkbevd/ChangeLog b/x11-apps/xkbevd/ChangeLog
index 3c49f03f4c74..fba2473f3b35 100644
--- a/x11-apps/xkbevd/ChangeLog
+++ b/x11-apps/xkbevd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xkbevd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/ChangeLog,v 1.9 2005/12/23 10:40:48 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/ChangeLog,v 1.10 2005/12/26 21:13:46 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xkbevd-0.99.3.ebuild, -xkbevd-1.0.0.ebuild:
+  Pull old versions.
 
 *xkbevd-1.0.1 (23 Dec 2005)
 
diff --git a/x11-apps/xkbevd/files/digest-xkbevd-0.99.3 b/x11-apps/xkbevd/files/digest-xkbevd-0.99.3
deleted file mode 100644
index 314a215cdc5e..000000000000
--- a/x11-apps/xkbevd/files/digest-xkbevd-0.99.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1053861185d47b8d87a64c1b89acacb2 xkbevd-0.99.3.tar.bz2 100954
diff --git a/x11-apps/xkbevd/files/digest-xkbevd-1.0.0 b/x11-apps/xkbevd/files/digest-xkbevd-1.0.0
deleted file mode 100644
index 174e11528883..000000000000
--- a/x11-apps/xkbevd/files/digest-xkbevd-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b4dacff8d6cca4aa2d14effc970e2522 xkbevd-1.0.0.tar.bz2 101643
diff --git a/x11-apps/xkbevd/xkbevd-0.99.3.ebuild b/x11-apps/xkbevd/xkbevd-0.99.3.ebuild
deleted file mode 100644
index 806823682101..000000000000
--- a/x11-apps/xkbevd/xkbevd-0.99.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/xkbevd-0.99.3.ebuild,v 1.1 2005/12/04 22:07:43 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xkbevd application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
-RDEPEND="x11-libs/libxkbfile"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbevd/xkbevd-1.0.0.ebuild b/x11-apps/xkbevd/xkbevd-1.0.0.ebuild
deleted file mode 100644
index bcd56e20580d..000000000000
--- a/x11-apps/xkbevd/xkbevd-1.0.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/xkbevd-1.0.0.ebuild,v 1.1 2005/12/18 19:40:07 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xkbevd application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
-RDEPEND="x11-libs/libxkbfile"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbprint/ChangeLog b/x11-apps/xkbprint/ChangeLog
index 47a8dd5a7fe0..4df2353af438 100644
--- a/x11-apps/xkbprint/ChangeLog
+++ b/x11-apps/xkbprint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xkbprint
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbprint/ChangeLog,v 1.9 2005/12/23 10:41:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbprint/ChangeLog,v 1.10 2005/12/26 21:14:14 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xkbprint-0.99.2.ebuild, -xkbprint-1.0.0.ebuild:
+  Pull old versions.
 
 *xkbprint-1.0.1 (23 Dec 2005)
 
diff --git a/x11-apps/xkbprint/files/digest-xkbprint-0.99.2 b/x11-apps/xkbprint/files/digest-xkbprint-0.99.2
deleted file mode 100644
index d2e9ce8743b7..000000000000
--- a/x11-apps/xkbprint/files/digest-xkbprint-0.99.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff363cd429fd03bb3a686a3159daceec xkbprint-0.99.2.tar.bz2 113971
diff --git a/x11-apps/xkbprint/files/digest-xkbprint-1.0.0 b/x11-apps/xkbprint/files/digest-xkbprint-1.0.0
deleted file mode 100644
index 2ac02a6410c0..000000000000
--- a/x11-apps/xkbprint/files/digest-xkbprint-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0eda96d08abf2f6a7e7d87b2bbfa02dc xkbprint-1.0.0.tar.bz2 114888
diff --git a/x11-apps/xkbprint/xkbprint-0.99.2.ebuild b/x11-apps/xkbprint/xkbprint-0.99.2.ebuild
deleted file mode 100644
index 80d2a3326c28..000000000000
--- a/x11-apps/xkbprint/xkbprint-0.99.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbprint/xkbprint-0.99.2.ebuild,v 1.1 2005/12/04 22:08:12 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xkbprint application"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
-RDEPEND="x11-libs/libxkbfile"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbprint/xkbprint-1.0.0.ebuild b/x11-apps/xkbprint/xkbprint-1.0.0.ebuild
deleted file mode 100644
index 79b2386380b0..000000000000
--- a/x11-apps/xkbprint/xkbprint-1.0.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbprint/xkbprint-1.0.0.ebuild,v 1.1 2005/12/18 19:40:46 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xkbprint application"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
-RDEPEND="x11-libs/libxkbfile"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbutils/ChangeLog b/x11-apps/xkbutils/ChangeLog
index 087045b43af6..14c7a2eec086 100644
--- a/x11-apps/xkbutils/ChangeLog
+++ b/x11-apps/xkbutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xkbutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/ChangeLog,v 1.9 2005/12/23 10:41:28 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/ChangeLog,v 1.10 2005/12/26 21:14:47 joshuabaergen Exp $
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xkbutils-0.99.2.ebuild, -xkbutils-1.0.0.ebuild:
+  Pull old versions.
 
 *xkbutils-1.0.1 (23 Dec 2005)
 
diff --git a/x11-apps/xkbutils/files/digest-xkbutils-0.99.2 b/x11-apps/xkbutils/files/digest-xkbutils-0.99.2
deleted file mode 100644
index b74cd0dca752..000000000000
--- a/x11-apps/xkbutils/files/digest-xkbutils-0.99.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 24177761ac1fd1ac1443f0f6c328af39 xkbutils-0.99.2.tar.bz2 64614
diff --git a/x11-apps/xkbutils/files/digest-xkbutils-1.0.0 b/x11-apps/xkbutils/files/digest-xkbutils-1.0.0
deleted file mode 100644
index b71ad6acffc6..000000000000
--- a/x11-apps/xkbutils/files/digest-xkbutils-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e63c5ca479162e45d18190c703b03b5b xkbutils-1.0.0.tar.bz2 65268
diff --git a/x11-apps/xkbutils/xkbutils-0.99.2.ebuild b/x11-apps/xkbutils/xkbutils-0.99.2.ebuild
deleted file mode 100644
index ead162fff86c..000000000000
--- a/x11-apps/xkbutils/xkbutils-0.99.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/xkbutils-0.99.2.ebuild,v 1.1 2005/12/04 22:08:37 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xkbutils application"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
-IUSE="xprint"
-RDEPEND="x11-libs/libxkbfile
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="$(use_enable xprint)"
-
-pkg_setup() {
-	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
-		die "Build x11-libs/libXaw with USE=xprint."
-	fi
-}
diff --git a/x11-apps/xkbutils/xkbutils-1.0.0.ebuild b/x11-apps/xkbutils/xkbutils-1.0.0.ebuild
deleted file mode 100644
index 8275cd2777c8..000000000000
--- a/x11-apps/xkbutils/xkbutils-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/xkbutils-1.0.0.ebuild,v 1.1 2005/12/18 19:41:18 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xkbutils application"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
-IUSE="xprint"
-RDEPEND="x11-libs/libxkbfile
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="$(use_enable xprint)"
-
-pkg_setup() {
-	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
-		die "Build x11-libs/libXaw with USE=xprint."
-	fi
-}