Bump for 7.0RC3.

Package-Manager: portage-2.0.53

274 files changed, 2493 insertions, 91 deletions

diff --git a/x11-apps/appres/ChangeLog b/x11-apps/appres/ChangeLog
index 3e22f10245cb..8ccf33cbc1b0 100644
--- a/x11-apps/appres/ChangeLog
+++ b/x11-apps/appres/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/appres
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/ChangeLog,v 1.4 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/ChangeLog,v 1.5 2005/12/04 21:40:00 joshuabaergen Exp $
+
+*appres-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +appres-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *appres-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/appres/appres-0.99.2.ebuild b/x11-apps/appres/appres-0.99.2.ebuild
new file mode 100644
index 000000000000..33e585348a30
--- /dev/null
+++ b/x11-apps/appres/appres-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/appres-0.99.2.ebuild,v 1.1 2005/12/04 21:40:01 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org appres application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/appres/files/digest-appres-0.99.2 b/x11-apps/appres/files/digest-appres-0.99.2
new file mode 100644
index 000000000000..1ee1fbafa2db
--- /dev/null
+++ b/x11-apps/appres/files/digest-appres-0.99.2
@@ -0,0 +1 @@
+MD5 5616bd807596d8dfc4ca66871dbe2d82 appres-0.99.2.tar.bz2 73637
diff --git a/x11-apps/bdftopcf/ChangeLog b/x11-apps/bdftopcf/ChangeLog
index 5c4eeb8ce264..58271251630c 100644
--- a/x11-apps/bdftopcf/ChangeLog
+++ b/x11-apps/bdftopcf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/bdftopcf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/ChangeLog,v 1.9 2005/11/11 19:47:04 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/ChangeLog,v 1.10 2005/12/04 21:40:31 joshuabaergen Exp $
+
+*bdftopcf-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +bdftopcf-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *bdftopcf-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/bdftopcf/bdftopcf-0.99.3.ebuild b/x11-apps/bdftopcf/bdftopcf-0.99.3.ebuild
new file mode 100644
index 000000000000..565247e8a341
--- /dev/null
+++ b/x11-apps/bdftopcf/bdftopcf-0.99.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/bdftopcf-0.99.3.ebuild,v 1.1 2005/12/04 21:40:31 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org bdftopcf application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-libs/libXfont"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/files/digest-bdftopcf-0.99.3 b/x11-apps/bdftopcf/files/digest-bdftopcf-0.99.3
new file mode 100644
index 000000000000..89121ed1415a
--- /dev/null
+++ b/x11-apps/bdftopcf/files/digest-bdftopcf-0.99.3
@@ -0,0 +1 @@
+MD5 1cc9372cdc01979260cc4bac5c9dee36 bdftopcf-0.99.3.tar.bz2 73701
diff --git a/x11-apps/beforelight/ChangeLog b/x11-apps/beforelight/ChangeLog
index 6ce30c062cf8..2ba5483d2c3e 100644
--- a/x11-apps/beforelight/ChangeLog
+++ b/x11-apps/beforelight/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/beforelight
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/beforelight/ChangeLog,v 1.6 2005/11/11 19:47:29 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/beforelight/ChangeLog,v 1.7 2005/12/04 21:40:57 joshuabaergen Exp $
+
+*beforelight-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +beforelight-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *beforelight-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/beforelight/beforelight-0.99.3.ebuild b/x11-apps/beforelight/beforelight-0.99.3.ebuild
new file mode 100644
index 000000000000..1c4347121e9c
--- /dev/null
+++ b/x11-apps/beforelight/beforelight-0.99.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/beforelight/beforelight-0.99.3.ebuild,v 1.1 2005/12/04 21:40:57 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org beforelight application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXt
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/beforelight/files/digest-beforelight-0.99.3 b/x11-apps/beforelight/files/digest-beforelight-0.99.3
new file mode 100644
index 000000000000..88de0acd6404
--- /dev/null
+++ b/x11-apps/beforelight/files/digest-beforelight-0.99.3
@@ -0,0 +1 @@
+MD5 f02d9de3a5508ac446f474b7ed5c4477 beforelight-0.99.3.tar.bz2 75598
diff --git a/x11-apps/bitmap/ChangeLog b/x11-apps/bitmap/ChangeLog
index ba86aa4ea5be..0b7927474004 100644
--- a/x11-apps/bitmap/ChangeLog
+++ b/x11-apps/bitmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/bitmap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/ChangeLog,v 1.5 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/ChangeLog,v 1.6 2005/12/04 21:41:32 joshuabaergen Exp $
+
+*bitmap-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +bitmap-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *bitmap-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/bitmap/bitmap-0.99.2.ebuild b/x11-apps/bitmap/bitmap-0.99.2.ebuild
new file mode 100644
index 000000000000..c048f2779178
--- /dev/null
+++ b/x11-apps/bitmap/bitmap-0.99.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/bitmap-0.99.2.ebuild,v 1.1 2005/12/04 21:41:32 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org bitmap application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+IUSE="xprint"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXaw
+	x11-misc/xbitmaps"
+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/bitmap/files/digest-bitmap-0.99.2 b/x11-apps/bitmap/files/digest-bitmap-0.99.2
new file mode 100644
index 000000000000..58bf1ef53779
--- /dev/null
+++ b/x11-apps/bitmap/files/digest-bitmap-0.99.2
@@ -0,0 +1 @@
+MD5 8ac9c282836577abd085a6e8b75b3a30 bitmap-0.99.2.tar.bz2 116094
diff --git a/x11-apps/editres/ChangeLog b/x11-apps/editres/ChangeLog
index 2445058e20ab..115ae7da932c 100644
--- a/x11-apps/editres/ChangeLog
+++ b/x11-apps/editres/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/editres
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/editres/ChangeLog,v 1.4 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/editres/ChangeLog,v 1.5 2005/12/04 21:41:57 joshuabaergen Exp $
+
+*editres-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +editres-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *editres-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/editres/editres-0.99.2.ebuild b/x11-apps/editres/editres-0.99.2.ebuild
new file mode 100644
index 000000000000..fc916b1d91b2
--- /dev/null
+++ b/x11-apps/editres/editres-0.99.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/editres/editres-0.99.2.ebuild,v 1.1 2005/12/04 21:41:57 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org editres application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+IUSE="xprint"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	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/editres/files/digest-editres-0.99.2 b/x11-apps/editres/files/digest-editres-0.99.2
new file mode 100644
index 000000000000..d7cb0489d691
--- /dev/null
+++ b/x11-apps/editres/files/digest-editres-0.99.2
@@ -0,0 +1 @@
+MD5 2e404b57bf5be03ab3104a350aa30210 editres-0.99.2.tar.bz2 114505
diff --git a/x11-apps/fonttosfnt/ChangeLog b/x11-apps/fonttosfnt/ChangeLog
index 18fb15e16d84..fa6a08de3470 100644
--- a/x11-apps/fonttosfnt/ChangeLog
+++ b/x11-apps/fonttosfnt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/fonttosfnt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/ChangeLog,v 1.5 2005/11/11 19:47:59 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/ChangeLog,v 1.6 2005/12/04 21:42:23 joshuabaergen Exp $
+
+*fonttosfnt-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +fonttosfnt-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *fonttosfnt-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/fonttosfnt/files/digest-fonttosfnt-0.99.3 b/x11-apps/fonttosfnt/files/digest-fonttosfnt-0.99.3
new file mode 100644
index 000000000000..b2717ff64e15
--- /dev/null
+++ b/x11-apps/fonttosfnt/files/digest-fonttosfnt-0.99.3
@@ -0,0 +1 @@
+MD5 b2cc6665493f0a9ca0102248979acbac fonttosfnt-0.99.3.tar.bz2 89245
diff --git a/x11-apps/fonttosfnt/fonttosfnt-0.99.3.ebuild b/x11-apps/fonttosfnt/fonttosfnt-0.99.3.ebuild
new file mode 100644
index 000000000000..62a17f0e9a4e
--- /dev/null
+++ b/x11-apps/fonttosfnt/fonttosfnt-0.99.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/fonttosfnt-0.99.3.ebuild,v 1.1 2005/12/04 21:42:23 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org fonttosfnt application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	=media-libs/freetype-2*
+	x11-libs/libfontenc"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/fslsfonts/ChangeLog b/x11-apps/fslsfonts/ChangeLog
index c25fc47d20d6..ac72fdb98a33 100644
--- a/x11-apps/fslsfonts/ChangeLog
+++ b/x11-apps/fslsfonts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/fslsfonts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/ChangeLog,v 1.4 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/ChangeLog,v 1.5 2005/12/04 21:42:53 joshuabaergen Exp $
+
+*fslsfonts-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +fslsfonts-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *fslsfonts-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/fslsfonts/files/digest-fslsfonts-0.99.2 b/x11-apps/fslsfonts/files/digest-fslsfonts-0.99.2
new file mode 100644
index 000000000000..9cc7ca749d7f
--- /dev/null
+++ b/x11-apps/fslsfonts/files/digest-fslsfonts-0.99.2
@@ -0,0 +1 @@
+MD5 0f01907ac3291121217fd280de7c42b0 fslsfonts-0.99.2.tar.bz2 75686
diff --git a/x11-apps/fslsfonts/fslsfonts-0.99.2.ebuild b/x11-apps/fslsfonts/fslsfonts-0.99.2.ebuild
new file mode 100644
index 000000000000..bdad57c00e6a
--- /dev/null
+++ b/x11-apps/fslsfonts/fslsfonts-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/fslsfonts-0.99.2.ebuild,v 1.1 2005/12/04 21:42:53 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org fslsfonts application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/fstobdf/ChangeLog b/x11-apps/fstobdf/ChangeLog
index 1ccd7c0b1c33..62a1977e9432 100644
--- a/x11-apps/fstobdf/ChangeLog
+++ b/x11-apps/fstobdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/fstobdf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/ChangeLog,v 1.5 2005/11/11 19:48:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/ChangeLog,v 1.6 2005/12/04 21:43:20 joshuabaergen Exp $
+
+*fstobdf-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +fstobdf-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *fstobdf-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/fstobdf/files/digest-fstobdf-0.99.3 b/x11-apps/fstobdf/files/digest-fstobdf-0.99.3
new file mode 100644
index 000000000000..3af3887dcbf8
--- /dev/null
+++ b/x11-apps/fstobdf/files/digest-fstobdf-0.99.3
@@ -0,0 +1 @@
+MD5 a41e838d8fef471f6f0243faec6e1e0e fstobdf-0.99.3.tar.bz2 77533
diff --git a/x11-apps/fstobdf/fstobdf-0.99.3.ebuild b/x11-apps/fstobdf/fstobdf-0.99.3.ebuild
new file mode 100644
index 000000000000..a6a435963701
--- /dev/null
+++ b/x11-apps/fstobdf/fstobdf-0.99.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/fstobdf-0.99.3.ebuild,v 1.1 2005/12/04 21:43:20 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org fstobdf application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/iceauth/ChangeLog b/x11-apps/iceauth/ChangeLog
index e45b3f7ff8e4..bc190baeebe4 100644
--- a/x11-apps/iceauth/ChangeLog
+++ b/x11-apps/iceauth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/iceauth
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/ChangeLog,v 1.8 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/ChangeLog,v 1.9 2005/12/04 21:43:51 joshuabaergen Exp $
+
+*iceauth-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +iceauth-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *iceauth-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/iceauth/files/digest-iceauth-0.99.2 b/x11-apps/iceauth/files/digest-iceauth-0.99.2
new file mode 100644
index 000000000000..3f6d604565cd
--- /dev/null
+++ b/x11-apps/iceauth/files/digest-iceauth-0.99.2
@@ -0,0 +1 @@
+MD5 0ed81ddc7512d24901e9128bed50d3ba iceauth-0.99.2.tar.bz2 83237
diff --git a/x11-apps/iceauth/iceauth-0.99.2.ebuild b/x11-apps/iceauth/iceauth-0.99.2.ebuild
new file mode 100644
index 000000000000..4c9a00dde5cd
--- /dev/null
+++ b/x11-apps/iceauth/iceauth-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/iceauth-0.99.2.ebuild,v 1.1 2005/12/04 21:43:51 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org iceauth application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libICE"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/ico/ChangeLog b/x11-apps/ico/ChangeLog
index 3398928021ee..809184a195f0 100644
--- a/x11-apps/ico/ChangeLog
+++ b/x11-apps/ico/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/ico
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ico/ChangeLog,v 1.9 2005/11/11 19:48:50 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ico/ChangeLog,v 1.10 2005/12/04 21:44:20 joshuabaergen Exp $
+
+*ico-0.99.4 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +ico-0.99.4.ebuild:
+  Bump for 7.0RC3.
 
 *ico-0.99.3 (11 Nov 2005)
 
diff --git a/x11-apps/ico/files/digest-ico-0.99.4 b/x11-apps/ico/files/digest-ico-0.99.4
new file mode 100644
index 000000000000..43e108c5ea28
--- /dev/null
+++ b/x11-apps/ico/files/digest-ico-0.99.4
@@ -0,0 +1 @@
+MD5 162bdb7c2960aa02553888d43bbc5104 ico-0.99.4.tar.bz2 84571
diff --git a/x11-apps/ico/ico-0.99.4.ebuild b/x11-apps/ico/ico-0.99.4.ebuild
new file mode 100644
index 000000000000..f9e1cba8bf87
--- /dev/null
+++ b/x11-apps/ico/ico-0.99.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ico/ico-0.99.4.ebuild,v 1.1 2005/12/04 21:44:20 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org ico application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND=">=x11-libs/libX11-0.99.1_pre0"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/lbxproxy/ChangeLog b/x11-apps/lbxproxy/ChangeLog
index c6ca278be666..5eeeda357078 100644
--- a/x11-apps/lbxproxy/ChangeLog
+++ b/x11-apps/lbxproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/lbxproxy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/lbxproxy/ChangeLog,v 1.7 2005/11/11 19:49:16 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/lbxproxy/ChangeLog,v 1.8 2005/12/04 21:44:56 joshuabaergen Exp $
+
+*lbxproxy-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +lbxproxy-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *lbxproxy-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/lbxproxy/files/digest-lbxproxy-0.99.3 b/x11-apps/lbxproxy/files/digest-lbxproxy-0.99.3
new file mode 100644
index 000000000000..8edb2db848fb
--- /dev/null
+++ b/x11-apps/lbxproxy/files/digest-lbxproxy-0.99.3
@@ -0,0 +1 @@
+MD5 73dbec7ee523ba6abe2e301f888cb717 lbxproxy-0.99.3.tar.bz2 182030
diff --git a/x11-apps/lbxproxy/lbxproxy-0.99.3.ebuild b/x11-apps/lbxproxy/lbxproxy-0.99.3.ebuild
new file mode 100644
index 000000000000..360a32ec179d
--- /dev/null
+++ b/x11-apps/lbxproxy/lbxproxy-0.99.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/lbxproxy/lbxproxy-0.99.3.ebuild,v 1.1 2005/12/04 21:44:56 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org lbxproxy application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/xtrans
+	x11-libs/libXext
+	x11-libs/liblbxutil
+	x11-libs/libX11
+	x11-libs/libICE"
+DEPEND="${RDEPEND}
+	x11-proto/xproxymanagementprotocol"
+IUSE="ipv6"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-apps/listres/ChangeLog b/x11-apps/listres/ChangeLog
index d3256f85c74a..9e603e070b79 100644
--- a/x11-apps/listres/ChangeLog
+++ b/x11-apps/listres/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/listres
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/listres/ChangeLog,v 1.4 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/listres/ChangeLog,v 1.5 2005/12/04 21:45:25 joshuabaergen Exp $
+
+*listres-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +listres-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *listres-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/listres/files/digest-listres-0.99.2 b/x11-apps/listres/files/digest-listres-0.99.2
new file mode 100644
index 000000000000..3eaf1a42bc1b
--- /dev/null
+++ b/x11-apps/listres/files/digest-listres-0.99.2
@@ -0,0 +1 @@
+MD5 96263a4b8170e502d3a94f1dda776240 listres-0.99.2.tar.bz2 75429
diff --git a/x11-apps/listres/listres-0.99.2.ebuild b/x11-apps/listres/listres-0.99.2.ebuild
new file mode 100644
index 000000000000..f341f1d5f821
--- /dev/null
+++ b/x11-apps/listres/listres-0.99.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/listres/listres-0.99.2.ebuild,v 1.1 2005/12/04 21:45:25 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org listres application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+IUSE="xprint"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	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/luit/ChangeLog b/x11-apps/luit/ChangeLog
index 44ba10f3b717..9731fc213680 100644
--- a/x11-apps/luit/ChangeLog
+++ b/x11-apps/luit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/luit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/luit/ChangeLog,v 1.4 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/luit/ChangeLog,v 1.5 2005/12/04 21:45:50 joshuabaergen Exp $
+
+*luit-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +luit-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *luit-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/luit/files/digest-luit-0.99.2 b/x11-apps/luit/files/digest-luit-0.99.2
new file mode 100644
index 000000000000..a748c07a3bd0
--- /dev/null
+++ b/x11-apps/luit/files/digest-luit-0.99.2
@@ -0,0 +1 @@
+MD5 7b710538c3b7ebe52a2fa87ef84c063f luit-0.99.2.tar.bz2 90631
diff --git a/x11-apps/luit/luit-0.99.2.ebuild b/x11-apps/luit/luit-0.99.2.ebuild
new file mode 100644
index 000000000000..0c65c67d8e66
--- /dev/null
+++ b/x11-apps/luit/luit-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/luit/luit-0.99.2.ebuild,v 1.1 2005/12/04 21:45:50 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org luit application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libfontenc"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkcfm/ChangeLog b/x11-apps/mkcfm/ChangeLog
index 22e1c6a0403a..d46ae9b97eca 100644
--- a/x11-apps/mkcfm/ChangeLog
+++ b/x11-apps/mkcfm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/mkcfm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/ChangeLog,v 1.2 2005/11/11 19:49:50 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/ChangeLog,v 1.3 2005/12/04 21:46:15 joshuabaergen Exp $
+
+*mkcfm-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +mkcfm-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *mkcfm-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/mkcfm/files/digest-mkcfm-0.99.3 b/x11-apps/mkcfm/files/digest-mkcfm-0.99.3
new file mode 100644
index 000000000000..0a6d830ad931
--- /dev/null
+++ b/x11-apps/mkcfm/files/digest-mkcfm-0.99.3
@@ -0,0 +1 @@
+MD5 d904eeab82e09536704b63ec01592ceb mkcfm-0.99.3.tar.bz2 74621
diff --git a/x11-apps/mkcfm/mkcfm-0.99.3.ebuild b/x11-apps/mkcfm/mkcfm-0.99.3.ebuild
new file mode 100644
index 000000000000..7ba34b70c612
--- /dev/null
+++ b/x11-apps/mkcfm/mkcfm-0.99.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/mkcfm-0.99.3.ebuild,v 1.1 2005/12/04 21:46:15 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org mkcfm application"
+KEYWORDS="~x86"
+RDEPEND="x11-libs/libXfont
+	x11-libs/libX11
+	x11-libs/libFS"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/libXfont cid; then
+		die "Build x11-libs/libXfont with USE=cid."
+	fi
+}
+
diff --git a/x11-apps/mkfontdir/ChangeLog b/x11-apps/mkfontdir/ChangeLog
index 1e96b27b4dff..221b1aedac10 100644
--- a/x11-apps/mkfontdir/ChangeLog
+++ b/x11-apps/mkfontdir/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/mkfontdir
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/ChangeLog,v 1.8 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/ChangeLog,v 1.9 2005/12/04 21:46:50 joshuabaergen Exp $
+
+*mkfontdir-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +mkfontdir-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *mkfontdir-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/mkfontdir/files/digest-mkfontdir-0.99.2 b/x11-apps/mkfontdir/files/digest-mkfontdir-0.99.2
new file mode 100644
index 000000000000..f4f324ee1b68
--- /dev/null
+++ b/x11-apps/mkfontdir/files/digest-mkfontdir-0.99.2
@@ -0,0 +1 @@
+MD5 04875394c88a6bb6ff6c02561c56e87b mkfontdir-0.99.2.tar.bz2 60273
diff --git a/x11-apps/mkfontdir/mkfontdir-0.99.2.ebuild b/x11-apps/mkfontdir/mkfontdir-0.99.2.ebuild
new file mode 100644
index 000000000000..e6b767b05ba6
--- /dev/null
+++ b/x11-apps/mkfontdir/mkfontdir-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-0.99.2.ebuild,v 1.1 2005/12/04 21:46:50 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org mkfontdir application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-apps/mkfontscale"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontscale/ChangeLog b/x11-apps/mkfontscale/ChangeLog
index 7b268e00213f..cd5a6f9a7381 100644
--- a/x11-apps/mkfontscale/ChangeLog
+++ b/x11-apps/mkfontscale/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/mkfontscale
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/ChangeLog,v 1.8 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/ChangeLog,v 1.9 2005/12/04 21:47:21 joshuabaergen Exp $
+
+*mkfontscale-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +mkfontscale-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *mkfontscale-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/mkfontscale/files/digest-mkfontscale-0.99.2 b/x11-apps/mkfontscale/files/digest-mkfontscale-0.99.2
new file mode 100644
index 000000000000..323a7109c5d8
--- /dev/null
+++ b/x11-apps/mkfontscale/files/digest-mkfontscale-0.99.2
@@ -0,0 +1 @@
+MD5 35f2b80b163894f0067391cf5c4f219d mkfontscale-0.99.2.tar.bz2 86465
diff --git a/x11-apps/mkfontscale/mkfontscale-0.99.2.ebuild b/x11-apps/mkfontscale/mkfontscale-0.99.2.ebuild
new file mode 100644
index 000000000000..b29f5d714bae
--- /dev/null
+++ b/x11-apps/mkfontscale/mkfontscale-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-0.99.2.ebuild,v 1.1 2005/12/04 21:47:21 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org mkfontscale application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-libs/libfontenc
+	=media-libs/freetype-2*"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/oclock/ChangeLog b/x11-apps/oclock/ChangeLog
index befbee920d62..45d4914e9703 100644
--- a/x11-apps/oclock/ChangeLog
+++ b/x11-apps/oclock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/oclock
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/oclock/ChangeLog,v 1.5 2005/11/17 11:26:48 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/oclock/ChangeLog,v 1.6 2005/12/04 21:47:50 joshuabaergen Exp $
+
+*oclock-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +oclock-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> oclock-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/oclock/files/digest-oclock-0.99.2 b/x11-apps/oclock/files/digest-oclock-0.99.2
new file mode 100644
index 000000000000..2cfc66b4526b
--- /dev/null
+++ b/x11-apps/oclock/files/digest-oclock-0.99.2
@@ -0,0 +1 @@
+MD5 cdde4a3adeb40e134646a354de3cdf81 oclock-0.99.2.tar.bz2 81653
diff --git a/x11-apps/oclock/oclock-0.99.2.ebuild b/x11-apps/oclock/oclock-0.99.2.ebuild
new file mode 100644
index 000000000000..27bb80d41955
--- /dev/null
+++ b/x11-apps/oclock/oclock-0.99.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/oclock/oclock-0.99.2.ebuild,v 1.1 2005/12/04 21:47:50 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org oclock application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/pclcomp/ChangeLog b/x11-apps/pclcomp/ChangeLog
index 55a127ae9840..2ec6f4515aa3 100644
--- a/x11-apps/pclcomp/ChangeLog
+++ b/x11-apps/pclcomp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/pclcomp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/pclcomp/ChangeLog,v 1.4 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/pclcomp/ChangeLog,v 1.5 2005/12/04 21:48:25 joshuabaergen Exp $
+
+*pclcomp-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +pclcomp-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *pclcomp-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/pclcomp/files/digest-pclcomp-0.99.2 b/x11-apps/pclcomp/files/digest-pclcomp-0.99.2
new file mode 100644
index 000000000000..d2890b5b4f4d
--- /dev/null
+++ b/x11-apps/pclcomp/files/digest-pclcomp-0.99.2
@@ -0,0 +1 @@
+MD5 8b8f20662da6a85c965718c0174d2cfd pclcomp-0.99.2.tar.bz2 89091
diff --git a/x11-apps/pclcomp/pclcomp-0.99.2.ebuild b/x11-apps/pclcomp/pclcomp-0.99.2.ebuild
new file mode 100644
index 000000000000..dd4a54e76b8e
--- /dev/null
+++ b/x11-apps/pclcomp/pclcomp-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/pclcomp/pclcomp-0.99.2.ebuild,v 1.1 2005/12/04 21:48:25 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org pclcomp application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/proxymngr/ChangeLog b/x11-apps/proxymngr/ChangeLog
index f0016685a2ee..6a9da4363df8 100644
--- a/x11-apps/proxymngr/ChangeLog
+++ b/x11-apps/proxymngr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/proxymngr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/proxymngr/ChangeLog,v 1.4 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/proxymngr/ChangeLog,v 1.5 2005/12/04 21:48:55 joshuabaergen Exp $
+
+*proxymngr-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +proxymngr-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *proxymngr-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/proxymngr/files/digest-proxymngr-0.99.2 b/x11-apps/proxymngr/files/digest-proxymngr-0.99.2
new file mode 100644
index 000000000000..1b394e5f2104
--- /dev/null
+++ b/x11-apps/proxymngr/files/digest-proxymngr-0.99.2
@@ -0,0 +1 @@
+MD5 44f9c9b4d38dfcbc09d7accb3b382446 proxymngr-0.99.2.tar.bz2 90328
diff --git a/x11-apps/proxymngr/proxymngr-0.99.2.ebuild b/x11-apps/proxymngr/proxymngr-0.99.2.ebuild
new file mode 100644
index 000000000000..41696c0e72e2
--- /dev/null
+++ b/x11-apps/proxymngr/proxymngr-0.99.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/proxymngr/proxymngr-0.99.2.ebuild,v 1.1 2005/12/04 21:48:55 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org proxymngr application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libICE
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproxymanagementprotocol"
diff --git a/x11-apps/rgb/ChangeLog b/x11-apps/rgb/ChangeLog
index 4d21612ae436..e4952fab6286 100644
--- a/x11-apps/rgb/ChangeLog
+++ b/x11-apps/rgb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/rgb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/ChangeLog,v 1.11 2005/11/11 19:50:21 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/ChangeLog,v 1.12 2005/12/04 21:49:21 joshuabaergen Exp $
+
+*rgb-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +rgb-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *rgb-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/rgb/files/digest-rgb-0.99.3 b/x11-apps/rgb/files/digest-rgb-0.99.3
new file mode 100644
index 000000000000..7fede58ccb9f
--- /dev/null
+++ b/x11-apps/rgb/files/digest-rgb-0.99.3
@@ -0,0 +1 @@
+MD5 b8b58f314056ac4253d7920934562251 rgb-0.99.3.tar.bz2 86292
diff --git a/x11-apps/rgb/rgb-0.99.3.ebuild b/x11-apps/rgb/rgb-0.99.3.ebuild
new file mode 100644
index 000000000000..5247ea643dad
--- /dev/null
+++ b/x11-apps/rgb/rgb-0.99.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/rgb-0.99.3.ebuild,v 1.1 2005/12/04 21:49:21 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org rgb application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/scripts/ChangeLog b/x11-apps/scripts/ChangeLog
index 3bd73ec8d836..8468f968d99c 100644
--- a/x11-apps/scripts/ChangeLog
+++ b/x11-apps/scripts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/scripts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/scripts/ChangeLog,v 1.4 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/scripts/ChangeLog,v 1.5 2005/12/04 21:50:03 joshuabaergen Exp $
+
+*scripts-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +scripts-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *scripts-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/scripts/files/digest-scripts-0.99.2 b/x11-apps/scripts/files/digest-scripts-0.99.2
new file mode 100644
index 000000000000..3c8dd29b2146
--- /dev/null
+++ b/x11-apps/scripts/files/digest-scripts-0.99.2
@@ -0,0 +1 @@
+MD5 014a1119c2c207b302903157deec55f2 scripts-0.99.2.tar.bz2 71101
diff --git a/x11-apps/scripts/scripts-0.99.2.ebuild b/x11-apps/scripts/scripts-0.99.2.ebuild
new file mode 100644
index 000000000000..34f2522c46b2
--- /dev/null
+++ b/x11-apps/scripts/scripts-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/scripts/scripts-0.99.2.ebuild,v 1.1 2005/12/04 21:50:03 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org scripts application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/sessreg/ChangeLog b/x11-apps/sessreg/ChangeLog
index f6f94407adf9..0b9760a34566 100644
--- a/x11-apps/sessreg/ChangeLog
+++ b/x11-apps/sessreg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/sessreg
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/ChangeLog,v 1.2 2005/11/15 13:40:49 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/ChangeLog,v 1.3 2005/12/04 21:50:33 joshuabaergen Exp $
+
+*sessreg-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +sessreg-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   15 Nov 2005; Stephen P. Becker <geoman@gentoo.org> sessreg-0.99.1.ebuild:
   added ~mips keyword
diff --git a/x11-apps/sessreg/files/digest-sessreg-0.99.2 b/x11-apps/sessreg/files/digest-sessreg-0.99.2
new file mode 100644
index 000000000000..1e81f23d2d88
--- /dev/null
+++ b/x11-apps/sessreg/files/digest-sessreg-0.99.2
@@ -0,0 +1 @@
+MD5 7ffe219a450071bc4054b4cd9d8454e1 sessreg-0.99.2.tar.bz2 81095
diff --git a/x11-apps/sessreg/sessreg-0.99.2.ebuild b/x11-apps/sessreg/sessreg-0.99.2.ebuild
new file mode 100644
index 000000000000..bc7ece04efa3
--- /dev/null
+++ b/x11-apps/sessreg/sessreg-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/sessreg-0.99.2.ebuild,v 1.1 2005/12/04 21:50:33 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org sessreg application"
+KEYWORDS="~mips ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-apps/setxkbmap/ChangeLog b/x11-apps/setxkbmap/ChangeLog
index b14e926542fc..5021aa09d67b 100644
--- a/x11-apps/setxkbmap/ChangeLog
+++ b/x11-apps/setxkbmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/setxkbmap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.7 2005/11/11 19:50:57 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.8 2005/12/04 21:51:03 joshuabaergen Exp $
+
+*setxkbmap-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +setxkbmap-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *setxkbmap-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/setxkbmap/files/digest-setxkbmap-0.99.3 b/x11-apps/setxkbmap/files/digest-setxkbmap-0.99.3
new file mode 100644
index 000000000000..417fed3cff44
--- /dev/null
+++ b/x11-apps/setxkbmap/files/digest-setxkbmap-0.99.3
@@ -0,0 +1 @@
+MD5 092af411f774440d49f92ef01e581382 setxkbmap-0.99.3.tar.bz2 78842
diff --git a/x11-apps/setxkbmap/setxkbmap-0.99.3.ebuild b/x11-apps/setxkbmap/setxkbmap-0.99.3.ebuild
new file mode 100644
index 000000000000..345ae619b9ed
--- /dev/null
+++ b/x11-apps/setxkbmap/setxkbmap-0.99.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-0.99.3.ebuild,v 1.1 2005/12/04 21:51:03 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+# SNAPSHOT="yes"
+
+inherit x-modular
+
+PATCHES=""
+
+DESCRIPTION="X.Org setxkbmap application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libxkbfile
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/showfont/ChangeLog b/x11-apps/showfont/ChangeLog
index 8f08b2bfbe7d..58a257f5fdfd 100644
--- a/x11-apps/showfont/ChangeLog
+++ b/x11-apps/showfont/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/showfont
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/showfont/ChangeLog,v 1.4 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/showfont/ChangeLog,v 1.5 2005/12/04 21:51:43 joshuabaergen Exp $
+
+*showfont-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +showfont-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *showfont-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/showfont/files/digest-showfont-0.99.2 b/x11-apps/showfont/files/digest-showfont-0.99.2
new file mode 100644
index 000000000000..86e21e03ecf2
--- /dev/null
+++ b/x11-apps/showfont/files/digest-showfont-0.99.2
@@ -0,0 +1 @@
+MD5 1086bbf3493adab31e24ddc8d4a6e204 showfont-0.99.2.tar.bz2 75785
diff --git a/x11-apps/showfont/showfont-0.99.2.ebuild b/x11-apps/showfont/showfont-0.99.2.ebuild
new file mode 100644
index 000000000000..09361f15e8db
--- /dev/null
+++ b/x11-apps/showfont/showfont-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/showfont/showfont-0.99.2.ebuild,v 1.1 2005/12/04 21:51:43 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org showfont application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/smproxy/ChangeLog b/x11-apps/smproxy/ChangeLog
index 3771aabb3952..233714350ce0 100644
--- a/x11-apps/smproxy/ChangeLog
+++ b/x11-apps/smproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/smproxy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/smproxy/ChangeLog,v 1.4 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/smproxy/ChangeLog,v 1.5 2005/12/04 21:52:08 joshuabaergen Exp $
+
+*smproxy-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +smproxy-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *smproxy-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/smproxy/files/digest-smproxy-0.99.2 b/x11-apps/smproxy/files/digest-smproxy-0.99.2
new file mode 100644
index 000000000000..d21d81b0edcf
--- /dev/null
+++ b/x11-apps/smproxy/files/digest-smproxy-0.99.2
@@ -0,0 +1 @@
+MD5 f58e8f8b4179c600706cd443305d20a3 smproxy-0.99.2.tar.bz2 81672
diff --git a/x11-apps/smproxy/smproxy-0.99.2.ebuild b/x11-apps/smproxy/smproxy-0.99.2.ebuild
new file mode 100644
index 000000000000..028d408b1ada
--- /dev/null
+++ b/x11-apps/smproxy/smproxy-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/smproxy/smproxy-0.99.2.ebuild,v 1.1 2005/12/04 21:52:08 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org smproxy application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXt
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/viewres/ChangeLog b/x11-apps/viewres/ChangeLog
index 2f0dd26837df..b0bd110ff167 100644
--- a/x11-apps/viewres/ChangeLog
+++ b/x11-apps/viewres/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/viewres
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/viewres/ChangeLog,v 1.4 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/viewres/ChangeLog,v 1.5 2005/12/04 21:52:38 joshuabaergen Exp $
+
+*viewres-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +viewres-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *viewres-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/viewres/files/digest-viewres-0.99.2 b/x11-apps/viewres/files/digest-viewres-0.99.2
new file mode 100644
index 000000000000..7621e734dfe9
--- /dev/null
+++ b/x11-apps/viewres/files/digest-viewres-0.99.2
@@ -0,0 +1 @@
+MD5 e08bac9cea1a868ac7f0b332d83cd099 viewres-0.99.2.tar.bz2 83208
diff --git a/x11-apps/viewres/viewres-0.99.2.ebuild b/x11-apps/viewres/viewres-0.99.2.ebuild
new file mode 100644
index 000000000000..a044aeb021b5
--- /dev/null
+++ b/x11-apps/viewres/viewres-0.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/viewres/viewres-0.99.2.ebuild,v 1.1 2005/12/04 21:52:38 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org viewres 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/x11perf/ChangeLog b/x11-apps/x11perf/ChangeLog
index 6921ba2901ad..bf440ea59755 100644
--- a/x11-apps/x11perf/ChangeLog
+++ b/x11-apps/x11perf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/x11perf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/ChangeLog,v 1.5 2005/11/17 11:28:32 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/ChangeLog,v 1.6 2005/12/04 21:53:08 joshuabaergen Exp $
+
+*x11perf-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +x11perf-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> x11perf-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/x11perf/files/digest-x11perf-0.99.2 b/x11-apps/x11perf/files/digest-x11perf-0.99.2
new file mode 100644
index 000000000000..7af25a77fe2c
--- /dev/null
+++ b/x11-apps/x11perf/files/digest-x11perf-0.99.2
@@ -0,0 +1 @@
+MD5 fc21c7698b27b5672e457e92fafce975 x11perf-0.99.2.tar.bz2 126091
diff --git a/x11-apps/x11perf/x11perf-0.99.2.ebuild b/x11-apps/x11perf/x11perf-0.99.2.ebuild
new file mode 100644
index 000000000000..5d04b1ef130b
--- /dev/null
+++ b/x11-apps/x11perf/x11perf-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/x11perf-0.99.2.ebuild,v 1.1 2005/12/04 21:53:08 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org x11perf application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xauth/ChangeLog b/x11-apps/xauth/ChangeLog
index 180e78386954..05cece77f39e 100644
--- a/x11-apps/xauth/ChangeLog
+++ b/x11-apps/xauth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xauth
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/ChangeLog,v 1.11 2005/11/11 19:51:27 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/ChangeLog,v 1.12 2005/12/04 21:53:44 joshuabaergen Exp $
+
+*xauth-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xauth-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xauth-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xauth/files/digest-xauth-0.99.3 b/x11-apps/xauth/files/digest-xauth-0.99.3
new file mode 100644
index 000000000000..b6f3eaa85300
--- /dev/null
+++ b/x11-apps/xauth/files/digest-xauth-0.99.3
@@ -0,0 +1 @@
+MD5 e54c7cc9596988ab0da31fd7596e75c0 xauth-0.99.3.tar.bz2 94649
diff --git a/x11-apps/xauth/xauth-0.99.3.ebuild b/x11-apps/xauth/xauth-0.99.3.ebuild
new file mode 100644
index 000000000000..13984e84ce3a
--- /dev/null
+++ b/x11-apps/xauth/xauth-0.99.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-0.99.3.ebuild,v 1.1 2005/12/04 21:53:44 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xauth application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
+IUSE="ipv6"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-apps/xbiff/ChangeLog b/x11-apps/xbiff/ChangeLog
index 008dacce5d05..c64ee2b36255 100644
--- a/x11-apps/xbiff/ChangeLog
+++ b/x11-apps/xbiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xbiff
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbiff/ChangeLog,v 1.5 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbiff/ChangeLog,v 1.6 2005/12/04 21:54:13 joshuabaergen Exp $
+
+*xbiff-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xbiff-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xbiff-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xbiff/files/digest-xbiff-0.99.2 b/x11-apps/xbiff/files/digest-xbiff-0.99.2
new file mode 100644
index 000000000000..0eb65cd82037
--- /dev/null
+++ b/x11-apps/xbiff/files/digest-xbiff-0.99.2
@@ -0,0 +1 @@
+MD5 6b3b2754601608be44dc8f245d17fcb5 xbiff-0.99.2.tar.bz2 82412
diff --git a/x11-apps/xbiff/xbiff-0.99.2.ebuild b/x11-apps/xbiff/xbiff-0.99.2.ebuild
new file mode 100644
index 000000000000..f81a4d6d2f94
--- /dev/null
+++ b/x11-apps/xbiff/xbiff-0.99.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbiff/xbiff-0.99.2.ebuild,v 1.1 2005/12/04 21:54:13 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xbiff application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+IUSE="xprint"
+RDEPEND="x11-libs/libXaw
+	x11-misc/xbitmaps"
+DEPEND="${RDEPEND}"
+
+CONFIGURE_OPTIONS="$(use_enable xprint)"
diff --git a/x11-apps/xcalc/ChangeLog b/x11-apps/xcalc/ChangeLog
index 24f7a989d79d..60db7fca555c 100644
--- a/x11-apps/xcalc/ChangeLog
+++ b/x11-apps/xcalc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xcalc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcalc/ChangeLog,v 1.5 2005/11/17 11:44:18 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcalc/ChangeLog,v 1.6 2005/12/04 21:54:38 joshuabaergen Exp $
+
+*xcalc-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xcalc-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xcalc-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xcalc/files/digest-xcalc-0.99.2 b/x11-apps/xcalc/files/digest-xcalc-0.99.2
new file mode 100644
index 000000000000..5e49a96d7339
--- /dev/null
+++ b/x11-apps/xcalc/files/digest-xcalc-0.99.2
@@ -0,0 +1 @@
+MD5 f7e80a11b2dc5ca931087bbb635b1838 xcalc-0.99.2.tar.bz2 92254
diff --git a/x11-apps/xcalc/xcalc-0.99.2.ebuild b/x11-apps/xcalc/xcalc-0.99.2.ebuild
new file mode 100644
index 000000000000..0cd6b7d8289b
--- /dev/null
+++ b/x11-apps/xcalc/xcalc-0.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcalc/xcalc-0.99.2.ebuild,v 1.1 2005/12/04 21:54:38 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xcalc application"
+KEYWORDS="~amd64 ~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/xclipboard/ChangeLog b/x11-apps/xclipboard/ChangeLog
index 4e6fd25b6983..2d5af7b5cb55 100644
--- a/x11-apps/xclipboard/ChangeLog
+++ b/x11-apps/xclipboard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xclipboard
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclipboard/ChangeLog,v 1.5 2005/11/25 16:22:06 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclipboard/ChangeLog,v 1.6 2005/12/04 21:55:10 joshuabaergen Exp $
+
+*xclipboard-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xclipboard-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   25 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xclipboard-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xclipboard/files/digest-xclipboard-0.99.2 b/x11-apps/xclipboard/files/digest-xclipboard-0.99.2
new file mode 100644
index 000000000000..075f60e013ca
--- /dev/null
+++ b/x11-apps/xclipboard/files/digest-xclipboard-0.99.2
@@ -0,0 +1 @@
+MD5 abd378102ccfda63a99f45c0889fe459 xclipboard-0.99.2.tar.bz2 82001
diff --git a/x11-apps/xclipboard/xclipboard-0.99.2.ebuild b/x11-apps/xclipboard/xclipboard-0.99.2.ebuild
new file mode 100644
index 000000000000..25ffcce7f87b
--- /dev/null
+++ b/x11-apps/xclipboard/xclipboard-0.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclipboard/xclipboard-0.99.2.ebuild,v 1.1 2005/12/04 21:55:10 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xclipboard application"
+KEYWORDS="~amd64 ~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/xclock/ChangeLog b/x11-apps/xclock/ChangeLog
index f98344dcedcf..765ad3a2c471 100644
--- a/x11-apps/xclock/ChangeLog
+++ b/x11-apps/xclock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xclock
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclock/ChangeLog,v 1.7 2005/11/07 05:24:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclock/ChangeLog,v 1.8 2005/12/04 21:55:40 joshuabaergen Exp $
+
+*xclock-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xclock-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   07 Nov 2005; Doug Goldstein <cardoe@gentoo.org> xclock-0.99.1.ebuild:
   adding ~ppc keyword
diff --git a/x11-apps/xclock/files/digest-xclock-0.99.2 b/x11-apps/xclock/files/digest-xclock-0.99.2
new file mode 100644
index 000000000000..577699a7838f
--- /dev/null
+++ b/x11-apps/xclock/files/digest-xclock-0.99.2
@@ -0,0 +1 @@
+MD5 961b07d38ea0c964c5a3a1c9d04a1124 xclock-0.99.2.tar.bz2 98299
diff --git a/x11-apps/xclock/xclock-0.99.2.ebuild b/x11-apps/xclock/xclock-0.99.2.ebuild
new file mode 100644
index 000000000000..1cc5559051cf
--- /dev/null
+++ b/x11-apps/xclock/xclock-0.99.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclock/xclock-0.99.2.ebuild,v 1.1 2005/12/04 21:55:40 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xclock application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sparc ~x86"
+IUSE="xprint"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXft
+	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/xcmsdb/ChangeLog b/x11-apps/xcmsdb/ChangeLog
index 1709e2f34480..edbe7e2d3381 100644
--- a/x11-apps/xcmsdb/ChangeLog
+++ b/x11-apps/xcmsdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xcmsdb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/ChangeLog,v 1.4 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/ChangeLog,v 1.5 2005/12/04 21:56:20 joshuabaergen Exp $
+
+*xcmsdb-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xcmsdb-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xcmsdb-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xcmsdb/files/digest-xcmsdb-0.99.2 b/x11-apps/xcmsdb/files/digest-xcmsdb-0.99.2
new file mode 100644
index 000000000000..1dfcdfaae335
--- /dev/null
+++ b/x11-apps/xcmsdb/files/digest-xcmsdb-0.99.2
@@ -0,0 +1 @@
+MD5 4571428cb4fd2ef7926b0b2f79457b25 xcmsdb-0.99.2.tar.bz2 95318
diff --git a/x11-apps/xcmsdb/xcmsdb-0.99.2.ebuild b/x11-apps/xcmsdb/xcmsdb-0.99.2.ebuild
new file mode 100644
index 000000000000..be15add2f26f
--- /dev/null
+++ b/x11-apps/xcmsdb/xcmsdb-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/xcmsdb-0.99.2.ebuild,v 1.1 2005/12/04 21:56:20 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xcmsdb application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xconsole/ChangeLog b/x11-apps/xconsole/ChangeLog
index 9d444b0c110b..d47c81a94970 100644
--- a/x11-apps/xconsole/ChangeLog
+++ b/x11-apps/xconsole/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xconsole
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xconsole/ChangeLog,v 1.6 2005/11/17 11:41:41 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xconsole/ChangeLog,v 1.7 2005/12/04 21:56:46 joshuabaergen Exp $
+
+*xconsole-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xconsole-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xconsole-0.99.2.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xconsole/files/digest-xconsole-0.99.3 b/x11-apps/xconsole/files/digest-xconsole-0.99.3
new file mode 100644
index 000000000000..0674c0938119
--- /dev/null
+++ b/x11-apps/xconsole/files/digest-xconsole-0.99.3
@@ -0,0 +1 @@
+MD5 8dbbb4d183266e697ed49ec814c98768 xconsole-0.99.3.tar.bz2 80690
diff --git a/x11-apps/xconsole/xconsole-0.99.3.ebuild b/x11-apps/xconsole/xconsole-0.99.3.ebuild
new file mode 100644
index 000000000000..886c8b331106
--- /dev/null
+++ b/x11-apps/xconsole/xconsole-0.99.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xconsole/xconsole-0.99.3.ebuild,v 1.1 2005/12/04 21:56:46 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xconsole application"
+KEYWORDS="~amd64 ~mips ~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/xcursorgen/ChangeLog b/x11-apps/xcursorgen/ChangeLog
index deff7afcedb7..2cd086fc96e1 100644
--- a/x11-apps/xcursorgen/ChangeLog
+++ b/x11-apps/xcursorgen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xcursorgen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/ChangeLog,v 1.8 2005/11/11 19:52:29 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/ChangeLog,v 1.9 2005/12/04 21:57:20 joshuabaergen Exp $
+
+*xcursorgen-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xcursorgen-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xcursorgen-0.99.1 (11 Nov 2005)
 
diff --git a/x11-apps/xcursorgen/files/digest-xcursorgen-0.99.2 b/x11-apps/xcursorgen/files/digest-xcursorgen-0.99.2
new file mode 100644
index 000000000000..f4079c17d1d6
--- /dev/null
+++ b/x11-apps/xcursorgen/files/digest-xcursorgen-0.99.2
@@ -0,0 +1 @@
+MD5 5327ce370089d4e7a30b1dc3a2961999 xcursorgen-0.99.2.tar.bz2 77102
diff --git a/x11-apps/xcursorgen/xcursorgen-0.99.2.ebuild b/x11-apps/xcursorgen/xcursorgen-0.99.2.ebuild
new file mode 100644
index 000000000000..5eedd213cbd4
--- /dev/null
+++ b/x11-apps/xcursorgen/xcursorgen-0.99.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/xcursorgen-0.99.2.ebuild,v 1.1 2005/12/04 21:57:20 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xcursorgen application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXcursor
+	=media-libs/libpng-1.2*"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xdbedizzy/ChangeLog b/x11-apps/xdbedizzy/ChangeLog
index d98e58e0f11d..da58e985ae69 100644
--- a/x11-apps/xdbedizzy/ChangeLog
+++ b/x11-apps/xdbedizzy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xdbedizzy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdbedizzy/ChangeLog,v 1.5 2005/11/11 19:52:59 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdbedizzy/ChangeLog,v 1.6 2005/12/04 21:57:51 joshuabaergen Exp $
+
+*xdbedizzy-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdbedizzy-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xdbedizzy-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xdbedizzy/files/digest-xdbedizzy-0.99.3 b/x11-apps/xdbedizzy/files/digest-xdbedizzy-0.99.3
new file mode 100644
index 000000000000..4bfe1032f3a6
--- /dev/null
+++ b/x11-apps/xdbedizzy/files/digest-xdbedizzy-0.99.3
@@ -0,0 +1 @@
+MD5 5c5a249839d0b2d0a880d46db9141c2f xdbedizzy-0.99.3.tar.bz2 81893
diff --git a/x11-apps/xdbedizzy/xdbedizzy-0.99.3.ebuild b/x11-apps/xdbedizzy/xdbedizzy-0.99.3.ebuild
new file mode 100644
index 000000000000..8513dbd2855e
--- /dev/null
+++ b/x11-apps/xdbedizzy/xdbedizzy-0.99.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdbedizzy/xdbedizzy-0.99.3.ebuild,v 1.1 2005/12/04 21:57:51 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xdbedizzy application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+
+# xprint support isn't optional, despite what configure says.
+#IUSE="xprint"
+RDEPEND="x11-libs/libXext
+	x11-libs/libXprintUtil
+	x11-libs/libXp"
+#	xprint? ( x11-libs/libXprintUtil
+#		x11-libs/libXp )"
+DEPEND="${RDEPEND}"
+
+#CONFIGURE_OPTIONS="$(use_enable xprint)"
diff --git a/x11-apps/xditview/ChangeLog b/x11-apps/xditview/ChangeLog
index d4fc259c73e6..ca5b6030968e 100644
--- a/x11-apps/xditview/ChangeLog
+++ b/x11-apps/xditview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xditview
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xditview/ChangeLog,v 1.4 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xditview/ChangeLog,v 1.5 2005/12/04 21:58:29 joshuabaergen Exp $
+
+*xditview-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xditview-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xditview-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xditview/files/digest-xditview-0.99.2 b/x11-apps/xditview/files/digest-xditview-0.99.2
new file mode 100644
index 000000000000..342cead1364f
--- /dev/null
+++ b/x11-apps/xditview/files/digest-xditview-0.99.2
@@ -0,0 +1 @@
+MD5 feeea439c548a59f8b7bdd8cc7f33f6f xditview-0.99.2.tar.bz2 101190
diff --git a/x11-apps/xditview/xditview-0.99.2.ebuild b/x11-apps/xditview/xditview-0.99.2.ebuild
new file mode 100644
index 000000000000..7a4a6feb9292
--- /dev/null
+++ b/x11-apps/xditview/xditview-0.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xditview/xditview-0.99.2.ebuild,v 1.1 2005/12/04 21:58:29 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xditview 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/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index e8b258912f7b..27364ae92918 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.27 2005/11/17 04:12:58 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.28 2005/12/04 21:59:03 joshuabaergen Exp $
+
+*xdm-0.99.4 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xdm-0.99.4.ebuild:
+  Bump for 7.0RC3.
 
 *xdm-0.99.3_p20051113-r1 (17 Nov 2005)
 
diff --git a/x11-apps/xdm/files/digest-xdm-0.99.4 b/x11-apps/xdm/files/digest-xdm-0.99.4
new file mode 100644
index 000000000000..b1d6016918f3
--- /dev/null
+++ b/x11-apps/xdm/files/digest-xdm-0.99.4
@@ -0,0 +1 @@
+MD5 8ea0b887baf9d702c883f8e85fb100b8 xdm-0.99.4.tar.bz2 291986
diff --git a/x11-apps/xdm/xdm-0.99.4.ebuild b/x11-apps/xdm/xdm-0.99.4.ebuild
new file mode 100644
index 000000000000..aff29a951c62
--- /dev/null
+++ b/x11-apps/xdm/xdm-0.99.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-0.99.4.ebuild,v 1.1 2005/12/04 21:59:03 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit multilib x-modular pam
+
+DESCRIPTION="X.Org xdm application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="xprint ipv6 pam"
+RDEPEND="x11-apps/xrdb
+	x11-libs/libXdmcp
+	x11-libs/libXaw
+	>=x11-apps/xinit-0.99.1_pre20050905-r1
+	x11-libs/libX11
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+CONFIGURE_OPTIONS="$(use_enable xprint)
+	$(use_enable ipv6)
+	$(use_with pam)
+	--with-xdmconfigdir=/etc/X11/xdm"
+
+pkg_setup() {
+	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
+		die "Build x11-libs/libXaw with USE=xprint."
+	fi
+}
+
+src_install() {
+	x-modular_src_install
+	exeinto /usr/$(get_libdir)/X11/xdm
+	doexe ${FILESDIR}/Xsession
+	newpamd ${FILESDIR}/xdm.pamd xdm
+}
diff --git a/x11-apps/xdpyinfo/ChangeLog b/x11-apps/xdpyinfo/ChangeLog
index a7b798776d4e..6047bda3bc14 100644
--- a/x11-apps/xdpyinfo/ChangeLog
+++ b/x11-apps/xdpyinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xdpyinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/ChangeLog,v 1.7 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/ChangeLog,v 1.8 2005/12/04 21:59:31 joshuabaergen Exp $
+
+*xdpyinfo-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdpyinfo-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xdpyinfo-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xdpyinfo/files/digest-xdpyinfo-0.99.2 b/x11-apps/xdpyinfo/files/digest-xdpyinfo-0.99.2
new file mode 100644
index 000000000000..6797f3a16b1b
--- /dev/null
+++ b/x11-apps/xdpyinfo/files/digest-xdpyinfo-0.99.2
@@ -0,0 +1 @@
+MD5 3bb5b7d3650fce39ab1911813cb0f012 xdpyinfo-0.99.2.tar.bz2 86141
diff --git a/x11-apps/xdpyinfo/xdpyinfo-0.99.2.ebuild b/x11-apps/xdpyinfo/xdpyinfo-0.99.2.ebuild
new file mode 100644
index 000000000000..c9c5c5398df9
--- /dev/null
+++ b/x11-apps/xdpyinfo/xdpyinfo-0.99.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-0.99.2.ebuild,v 1.1 2005/12/04 21:59:31 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xdpyinfo application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86misc
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXinerama
+	x11-libs/libdmx
+	x11-libs/libXp"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/kbproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86miscproto
+	x11-proto/inputproto
+	x11-proto/renderproto
+	x11-proto/xineramaproto
+	x11-proto/dmxproto
+	x11-proto/printproto"
diff --git a/x11-apps/xdriinfo/ChangeLog b/x11-apps/xdriinfo/ChangeLog
index 69e907dac73d..9b7e0e7c27dc 100644
--- a/x11-apps/xdriinfo/ChangeLog
+++ b/x11-apps/xdriinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xdriinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/ChangeLog,v 1.4 2005/10/31 17:42:41 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/ChangeLog,v 1.5 2005/12/04 21:59:59 joshuabaergen Exp $
+
+*xdriinfo-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdriinfo-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xdriinfo-0.99.0_pre20050908.ebuild:
diff --git a/x11-apps/xdriinfo/files/digest-xdriinfo-0.99.2 b/x11-apps/xdriinfo/files/digest-xdriinfo-0.99.2
new file mode 100644
index 000000000000..cb0d0310a409
--- /dev/null
+++ b/x11-apps/xdriinfo/files/digest-xdriinfo-0.99.2
@@ -0,0 +1 @@
+MD5 76ffe35f42e4f51d73349f8c3b1812cc xdriinfo-0.99.2.tar.bz2 76346
diff --git a/x11-apps/xdriinfo/xdriinfo-0.99.2.ebuild b/x11-apps/xdriinfo/xdriinfo-0.99.2.ebuild
new file mode 100644
index 000000000000..3e7c6b5708d0
--- /dev/null
+++ b/x11-apps/xdriinfo/xdriinfo-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/xdriinfo-0.99.2.ebuild,v 1.1 2005/12/04 21:59:59 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xdriinfo application"
+KEYWORDS="~x86"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/glproto"
diff --git a/x11-apps/xedit/ChangeLog b/x11-apps/xedit/ChangeLog
index f77a4899c3d3..71ea26c53151 100644
--- a/x11-apps/xedit/ChangeLog
+++ b/x11-apps/xedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xedit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xedit/ChangeLog,v 1.8 2005/11/17 13:27:00 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xedit/ChangeLog,v 1.9 2005/12/04 22:00:28 joshuabaergen Exp $
+
+*xedit-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xedit-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xedit-0.99.2.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xedit/files/digest-xedit-0.99.3 b/x11-apps/xedit/files/digest-xedit-0.99.3
new file mode 100644
index 000000000000..ffd21d6110cf
--- /dev/null
+++ b/x11-apps/xedit/files/digest-xedit-0.99.3
@@ -0,0 +1 @@
+MD5 ec0c82ba9b80186ce6792f3fa9eff19d xedit-0.99.3.tar.bz2 439712
diff --git a/x11-apps/xedit/xedit-0.99.3.ebuild b/x11-apps/xedit/xedit-0.99.3.ebuild
new file mode 100644
index 000000000000..c423245f98dd
--- /dev/null
+++ b/x11-apps/xedit/xedit-0.99.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xedit/xedit-0.99.3.ebuild,v 1.1 2005/12/04 22:00:28 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xedit application"
+KEYWORDS="~amd64 ~mips ~sparc ~x86"
+IUSE="xprint"
+RDEPEND="x11-libs/libXprintUtil
+	x11-libs/libXaw
+	xprint? ( x11-libs/libXprintUtil )"
+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
+}
+
+#src_compile() {
+#	x-modular_src_configure
+#	emake -j1 || die "emake failed"
+#}
diff --git a/x11-apps/xev/ChangeLog b/x11-apps/xev/ChangeLog
index 5362e5b7af23..dd3c5cd0a7ee 100644
--- a/x11-apps/xev/ChangeLog
+++ b/x11-apps/xev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xev
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/ChangeLog,v 1.5 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/ChangeLog,v 1.6 2005/12/04 22:00:55 joshuabaergen Exp $
+
+*xev-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xev-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xev-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xev/files/digest-xev-0.99.2 b/x11-apps/xev/files/digest-xev-0.99.2
new file mode 100644
index 000000000000..a51ad8b4b969
--- /dev/null
+++ b/x11-apps/xev/files/digest-xev-0.99.2
@@ -0,0 +1 @@
+MD5 a264918cd4f90db7c87afe68f98d3582 xev-0.99.2.tar.bz2 78673
diff --git a/x11-apps/xev/xev-0.99.2.ebuild b/x11-apps/xev/xev-0.99.2.ebuild
new file mode 100644
index 000000000000..7a2fa50c923e
--- /dev/null
+++ b/x11-apps/xev/xev-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/xev-0.99.2.ebuild,v 1.1 2005/12/04 22:00:55 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xev application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xeyes/ChangeLog b/x11-apps/xeyes/ChangeLog
index 20e8e834b415..554f7f13b730 100644
--- a/x11-apps/xeyes/ChangeLog
+++ b/x11-apps/xeyes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xeyes
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xeyes/ChangeLog,v 1.5 2005/11/17 13:28:59 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xeyes/ChangeLog,v 1.6 2005/12/04 22:01:23 joshuabaergen Exp $
+
+*xeyes-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xeyes-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xeyes-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xeyes/files/digest-xeyes-0.99.2 b/x11-apps/xeyes/files/digest-xeyes-0.99.2
new file mode 100644
index 000000000000..5e805c65b5d6
--- /dev/null
+++ b/x11-apps/xeyes/files/digest-xeyes-0.99.2
@@ -0,0 +1 @@
+MD5 a8e1485e466607f6d3c2af75192a0af3 xeyes-0.99.2.tar.bz2 79831
diff --git a/x11-apps/xeyes/xeyes-0.99.2.ebuild b/x11-apps/xeyes/xeyes-0.99.2.ebuild
new file mode 100644
index 000000000000..c8a7f67a3233
--- /dev/null
+++ b/x11-apps/xeyes/xeyes-0.99.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xeyes/xeyes-0.99.2.ebuild,v 1.1 2005/12/04 22:01:23 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xeyes application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xf86dga/ChangeLog b/x11-apps/xf86dga/ChangeLog
index c1fbc445090c..27985f5fe6a5 100644
--- a/x11-apps/xf86dga/ChangeLog
+++ b/x11-apps/xf86dga/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xf86dga
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/ChangeLog,v 1.5 2005/11/11 19:54:15 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/ChangeLog,v 1.6 2005/12/04 22:01:55 joshuabaergen Exp $
+
+*xf86dga-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86dga-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xf86dga-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xf86dga/files/digest-xf86dga-0.99.3 b/x11-apps/xf86dga/files/digest-xf86dga-0.99.3
new file mode 100644
index 000000000000..a51c9610ee45
--- /dev/null
+++ b/x11-apps/xf86dga/files/digest-xf86dga-0.99.3
@@ -0,0 +1 @@
+MD5 233d5c219723dcda459290d4ac638347 xf86dga-0.99.3.tar.bz2 73971
diff --git a/x11-apps/xf86dga/xf86dga-0.99.3.ebuild b/x11-apps/xf86dga/xf86dga-0.99.3.ebuild
new file mode 100644
index 000000000000..e12224eb9da8
--- /dev/null
+++ b/x11-apps/xf86dga/xf86dga-0.99.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-0.99.3.ebuild,v 1.1 2005/12/04 22:01:55 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xf86dga application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXxf86dga"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xfd/ChangeLog b/x11-apps/xfd/ChangeLog
index 57dd975012f9..abf0ae000b93 100644
--- a/x11-apps/xfd/ChangeLog
+++ b/x11-apps/xfd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xfd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfd/ChangeLog,v 1.5 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfd/ChangeLog,v 1.6 2005/12/04 22:02:22 joshuabaergen Exp $
+
+*xfd-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xfd-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xfd-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xfd/files/digest-xfd-0.99.2 b/x11-apps/xfd/files/digest-xfd-0.99.2
new file mode 100644
index 000000000000..0dafe52b704a
--- /dev/null
+++ b/x11-apps/xfd/files/digest-xfd-0.99.2
@@ -0,0 +1 @@
+MD5 0b44706f52656d1762a00fcf4a522f33 xfd-0.99.2.tar.bz2 87311
diff --git a/x11-apps/xfd/xfd-0.99.2.ebuild b/x11-apps/xfd/xfd-0.99.2.ebuild
new file mode 100644
index 000000000000..3a36f4d522e9
--- /dev/null
+++ b/x11-apps/xfd/xfd-0.99.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfd/xfd-0.99.2.ebuild,v 1.1 2005/12/04 22:02:22 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xfd application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+IUSE="xprint"
+RDEPEND="=media-libs/freetype-2*
+	media-libs/fontconfig
+	x11-libs/libXft
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}"
+
+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/xfindproxy/ChangeLog b/x11-apps/xfindproxy/ChangeLog
index 1e575f5ea7fc..ab2e3fc1e5ba 100644
--- a/x11-apps/xfindproxy/ChangeLog
+++ b/x11-apps/xfindproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xfindproxy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfindproxy/ChangeLog,v 1.2 2005/11/11 19:54:43 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfindproxy/ChangeLog,v 1.3 2005/12/04 22:02:59 joshuabaergen Exp $
+
+*xfindproxy-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xfindproxy-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xfindproxy-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xfindproxy/files/digest-xfindproxy-0.99.3 b/x11-apps/xfindproxy/files/digest-xfindproxy-0.99.3
new file mode 100644
index 000000000000..dc98307765d6
--- /dev/null
+++ b/x11-apps/xfindproxy/files/digest-xfindproxy-0.99.3
@@ -0,0 +1 @@
+MD5 b4d27764923c88211abbfaa9f8cf767a xfindproxy-0.99.3.tar.bz2 76470
diff --git a/x11-apps/xfindproxy/xfindproxy-0.99.3.ebuild b/x11-apps/xfindproxy/xfindproxy-0.99.3.ebuild
new file mode 100644
index 000000000000..0aced2e54d4d
--- /dev/null
+++ b/x11-apps/xfindproxy/xfindproxy-0.99.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfindproxy/xfindproxy-0.99.3.ebuild,v 1.1 2005/12/04 22:02:59 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xfindproxy application"
+KEYWORDS="~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xfontsel/ChangeLog b/x11-apps/xfontsel/ChangeLog
index 61ee23fe87a6..7859434c4c19 100644
--- a/x11-apps/xfontsel/ChangeLog
+++ b/x11-apps/xfontsel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xfontsel
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfontsel/ChangeLog,v 1.5 2005/11/06 18:29:05 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfontsel/ChangeLog,v 1.6 2005/12/04 22:03:30 joshuabaergen Exp $
+
+*xfontsel-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xfontsel-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   06 Nov 2005; <dang@gentoo.org> xfontsel-0.99.1.ebuild:
   Marked ~amd64
diff --git a/x11-apps/xfontsel/files/digest-xfontsel-0.99.2 b/x11-apps/xfontsel/files/digest-xfontsel-0.99.2
new file mode 100644
index 000000000000..fe8085da1e9d
--- /dev/null
+++ b/x11-apps/xfontsel/files/digest-xfontsel-0.99.2
@@ -0,0 +1 @@
+MD5 2ba71df364afe06ee9c48a4ecce13e34 xfontsel-0.99.2.tar.bz2 94219
diff --git a/x11-apps/xfontsel/xfontsel-0.99.2.ebuild b/x11-apps/xfontsel/xfontsel-0.99.2.ebuild
new file mode 100644
index 000000000000..478d6ee55c74
--- /dev/null
+++ b/x11-apps/xfontsel/xfontsel-0.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfontsel/xfontsel-0.99.2.ebuild,v 1.1 2005/12/04 22:03:30 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xfontsel application"
+KEYWORDS="~amd64 ~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/xfs/ChangeLog b/x11-apps/xfs/ChangeLog
index 25ac39e17197..2fc074660493 100644
--- a/x11-apps/xfs/ChangeLog
+++ b/x11-apps/xfs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2005/11/11 19:55:14 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.11 2005/12/04 22:04:25 joshuabaergen Exp $
+
+*xfs-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xfs-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xfs-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xfs/files/digest-xfs-0.99.3 b/x11-apps/xfs/files/digest-xfs-0.99.3
new file mode 100644
index 000000000000..a2d4a5436564
--- /dev/null
+++ b/x11-apps/xfs/files/digest-xfs-0.99.3
@@ -0,0 +1 @@
+MD5 d2995737ceddc99d2f62b2cf835e92ff xfs-0.99.3.tar.bz2 139886
diff --git a/x11-apps/xfs/xfs-0.99.3.ebuild b/x11-apps/xfs/xfs-0.99.3.ebuild
new file mode 100644
index 000000000000..fd865d03f3e8
--- /dev/null
+++ b/x11-apps/xfs/xfs-0.99.3.ebuild
@@ -0,0 +1,43 @@
+# 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/xfsinfo/ChangeLog b/x11-apps/xfsinfo/ChangeLog
index 68152a93037a..6b2de8d1f4db 100644
--- a/x11-apps/xfsinfo/ChangeLog
+++ b/x11-apps/xfsinfo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfsinfo/ChangeLog,v 1.5 2005/12/04 22:03:54 joshuabaergen Exp $
+
+*xfsinfo-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xfsinfo-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xfsinfo-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xfsinfo/files/digest-xfsinfo-0.99.2 b/x11-apps/xfsinfo/files/digest-xfsinfo-0.99.2
new file mode 100644
index 000000000000..a5833be4ad83
--- /dev/null
+++ b/x11-apps/xfsinfo/files/digest-xfsinfo-0.99.2
@@ -0,0 +1 @@
+MD5 5c801a0ab3c98d990cd819f186e527be xfsinfo-0.99.2.tar.bz2 73162
diff --git a/x11-apps/xfsinfo/xfsinfo-0.99.2.ebuild b/x11-apps/xfsinfo/xfsinfo-0.99.2.ebuild
new file mode 100644
index 000000000000..eeb82dd460c4
--- /dev/null
+++ b/x11-apps/xfsinfo/xfsinfo-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# 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/xfwp/ChangeLog b/x11-apps/xfwp/ChangeLog
index 1cf7f14a95de..681d21b2bc09 100644
--- a/x11-apps/xfwp/ChangeLog
+++ b/x11-apps/xfwp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfwp/ChangeLog,v 1.5 2005/12/04 22:04:53 joshuabaergen Exp $
+
+*xfwp-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xfwp-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xfwp-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xfwp/files/digest-xfwp-0.99.2 b/x11-apps/xfwp/files/digest-xfwp-0.99.2
new file mode 100644
index 000000000000..788e1a750543
--- /dev/null
+++ b/x11-apps/xfwp/files/digest-xfwp-0.99.2
@@ -0,0 +1 @@
+MD5 423b0aa95d5c0d6e1dc62a25c9455ab4 xfwp-0.99.2.tar.bz2 103315
diff --git a/x11-apps/xfwp/xfwp-0.99.2.ebuild b/x11-apps/xfwp/xfwp-0.99.2.ebuild
new file mode 100644
index 000000000000..cb342cb75c82
--- /dev/null
+++ b/x11-apps/xfwp/xfwp-0.99.2.ebuild
@@ -0,0 +1,15 @@
+# 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/xgamma/ChangeLog b/x11-apps/xgamma/ChangeLog
index 0b08cf9b6d29..0229dd542dfe 100644
--- a/x11-apps/xgamma/ChangeLog
+++ b/x11-apps/xgamma/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2005/11/26 09:38:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/ChangeLog,v 1.6 2005/12/04 22:05:19 joshuabaergen Exp $
+
+*xgamma-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xgamma-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   26 Nov 2005; Simon Stelling <blubb@gentoo.org> xgamma-0.99.1.ebuild:
   added ~amd64 keyword
diff --git a/x11-apps/xgamma/files/digest-xgamma-0.99.2 b/x11-apps/xgamma/files/digest-xgamma-0.99.2
new file mode 100644
index 000000000000..ed0357eda88b
--- /dev/null
+++ b/x11-apps/xgamma/files/digest-xgamma-0.99.2
@@ -0,0 +1 @@
+MD5 d2fa330b2f3f66564d31f6eb8b38cc1b xgamma-0.99.2.tar.bz2 73825
diff --git a/x11-apps/xgamma/xgamma-0.99.2.ebuild b/x11-apps/xgamma/xgamma-0.99.2.ebuild
new file mode 100644
index 000000000000..9b633d3a9e2f
--- /dev/null
+++ b/x11-apps/xgamma/xgamma-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# 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/xgc/ChangeLog b/x11-apps/xgc/ChangeLog
index a6925ea7973c..f23ceb859389 100644
--- a/x11-apps/xgc/ChangeLog
+++ b/x11-apps/xgc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.4 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgc/ChangeLog,v 1.5 2005/12/04 22:05:46 joshuabaergen Exp $
+
+*xgc-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xgc-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xgc-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xgc/files/digest-xgc-0.99.2 b/x11-apps/xgc/files/digest-xgc-0.99.2
new file mode 100644
index 000000000000..aea25c32898f
--- /dev/null
+++ b/x11-apps/xgc/files/digest-xgc-0.99.2
@@ -0,0 +1 @@
+MD5 247841f01b9196d7ba0dae5f9e941a26 xgc-0.99.2.tar.bz2 127131
diff --git a/x11-apps/xgc/xgc-0.99.2.ebuild b/x11-apps/xgc/xgc-0.99.2.ebuild
new file mode 100644
index 000000000000..cab08e7fd2a2
--- /dev/null
+++ b/x11-apps/xgc/xgc-0.99.2.ebuild
@@ -0,0 +1,22 @@
+# 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/xhost/ChangeLog b/x11-apps/xhost/ChangeLog
index 3e13701305ba..876f1f56bd3f 100644
--- a/x11-apps/xhost/ChangeLog
+++ b/x11-apps/xhost/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2005/11/11 19:55:41 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/ChangeLog,v 1.12 2005/12/04 22:06:19 joshuabaergen Exp $
+
+*xhost-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xhost-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xhost-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xhost/files/digest-xhost-0.99.3 b/x11-apps/xhost/files/digest-xhost-0.99.3
new file mode 100644
index 000000000000..a99132459e01
--- /dev/null
+++ b/x11-apps/xhost/files/digest-xhost-0.99.3
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..6417150e3019
--- /dev/null
+++ b/x11-apps/xhost/xhost-0.99.3.ebuild
@@ -0,0 +1,17 @@
+# 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 25925b667642..1d88e08dc30f 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2005/11/11 19:38:36 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.25 2005/12/04 22:06:52 joshuabaergen Exp $
+
+*xinit-0.99.4 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/gentoo-startx-customization-0.99.4.patch, +xinit-0.99.4.ebuild:
+  Bump for 7.0RC3.
 
 *xinit-0.99.3 (11 Nov 2005)
 
diff --git a/x11-apps/xinit/files/digest-xinit-0.99.4 b/x11-apps/xinit/files/digest-xinit-0.99.4
new file mode 100644
index 000000000000..f746745234ee
--- /dev/null
+++ b/x11-apps/xinit/files/digest-xinit-0.99.4
@@ -0,0 +1 @@
+MD5 bb443db632476d4b2bd42e1558004267 xinit-0.99.4.tar.bz2 91094
diff --git a/x11-apps/xinit/files/gentoo-startx-customization-0.99.4.patch b/x11-apps/xinit/files/gentoo-startx-customization-0.99.4.patch
new file mode 100644
index 000000000000..2544fb0f4414
--- /dev/null
+++ b/x11-apps/xinit/files/gentoo-startx-customization-0.99.4.patch
@@ -0,0 +1,154 @@
+--- startx.cpp.old	2005-11-11 12:29:49.244146352 -0700
++++ startx.cpp	2005-11-11 12:34:11.169327672 -0700
+@@ -64,8 +64,6 @@
+ 
+ userserverrc=$HOME/.xserverrc
+ sysserverrc=XINITDIR/xserverrc
+-defaultclient=XTERM
+-defaultserver=XSERVER
+ defaultclientargs=""
+ defaultserverargs="-nolisten tcp -br"
+ clientargs=""
+@@ -107,60 +105,41 @@
+ whoseargs="client"
+ while [ x"$1" != x ]; do
+     case "$1" in
+-    XCOMM '' required to prevent cpp from treating "/*" as a C comment.
+-    /''*|\./''*)
+-	if [ "$whoseargs" = "client" ]; then
+-	    if [ x"$clientargs" = x ]; then
+-		client="$1"
+-	    else
+-		clientargs="$clientargs $1"
+-	    fi
+-	else
+-	    if [ x"$serverargs" = x ]; then
+-		server="$1"
+-	    else
+-		serverargs="$serverargs $1"
+-	    fi
+-	fi
+-	;;
+-    --)
+-	whoseargs="server"
+-	;;
+-    *)
+-	if [ "$whoseargs" = "client" ]; then
+-	    clientargs="$clientargs $1"
+-	else
+-	    XCOMM display must be the FIRST server argument
+-	    if [ x"$serverargs" = x ] && @@
+-		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
+-		display="$1"
+-	    else
+-		serverargs="$serverargs $1"
+-	    fi
+-	fi
+-	;;
++      /''*|\.*)       if [ "$whoseargs" = "client" ]; then
++                  if [ "x$clientargs" = x ]; then
++                      clientargs="$1"
++                  else
++                      clientargs="$clientargs $1"
++                  fi
++              else
++                  if [ "x$serverargs" = x ]; then
++                      serverargs="$1"
++                  else
++                      serverargs="$serverargs $1"
++                  fi
++              fi ;;
++      --)     whoseargs="server" ;;
++      *)      if [ "$whoseargs" = "client" ]; then
++                  if [ "x$clientargs" = x ]; then
++                      clientargs="$defaultclientargs $1"
++                  else
++                      clientargs="$clientargs $1"
++                  fi
++              else
++                  case "$1" in
++                      :[0-9]*) display="$1"; serverargs="$serverargs $1";;
++                      *) serverargs="$serverargs $1" ;;
++                  esac
++              fi ;;
+     esac
+     shift
+ done
+ 
+-XCOMM process client arguments
+-if [ x"$client" = x ]; then
+-    XCOMM if no client arguments either, use rc file instead
+-    if [ x"$clientargs" = x ]; then
+-	client="$defaultclientargs"
+-    else
+-	client=$defaultclient
+-    fi
++if [ x"$clientargs" = x ]; then
++	clientargs="$defaultclientargs"
+ fi
+-
+-XCOMM process server arguments
+-if [ x"$server" = x ]; then
+-    XCOMM if no server arguments or display either, use rc file instead
+-    if [ x"$serverargs" = x -a x"$display" = x ]; then
+-	server="$defaultserverargs"
+-    else
+-	server=$defaultserver
+-    fi
++if [ x"$serverargs" = x ]; then
++	serverargs="$defaultserverargs"
+ fi
+ 
+ if [ x"$XAUTHORITY" = x ]; then
+@@ -217,15 +196,8 @@
+ 
+ #endif
+ 
+-#if defined(__SCO__) || defined(__UNIXWARE__)
+-if [ "$REMOTE_SERVER" = "TRUE" ]; then
+-        exec SHELL_CMD ${client}
+-else
+-        XINIT $client $clientargs -- $server $display $serverargs
+-fi
+-#else
+-XINIT $client $clientargs -- $server $display $serverargs
+-#endif
++cleanup() {
++    [ -n "$PID" ] && kill $PID > /dev/null 2>&1
+ 
+ if [ x"$removelist" != x ]; then
+     BINDIR/xauth remove $removelist
+@@ -251,3 +223,15 @@
+ #if defined(sun)
+ kbd_mode -a
+ #endif
++}
++
++
++trap cleanup 0
++
++xinit $clientargs -- $serverargs -deferglyphs 16 &
++
++PID=$!
++
++wait $PID
++
++unset PID
+--- xinit.c.old	2005-11-11 12:30:19.199592432 -0700
++++ xinit.c	2005-11-11 12:30:47.983216656 -0700
+@@ -446,6 +446,7 @@
+ 	signal(SIGINT, sigCatch);
+ 	signal(SIGHUP, sigCatch);
+ 	signal(SIGPIPE, sigCatch);
++	signal(SIGTERM, sigCatch);
+ #else
+ 	/* Let those signal interrupt the wait() call in the main loop */
+ 	memset(&sa, 0, sizeof sa);
+@@ -458,6 +459,7 @@
+ 	sigaction(SIGINT, &sa, NULL);
+ 	sigaction(SIGHUP, &sa, NULL);
+ 	sigaction(SIGPIPE, &sa, NULL);
++	sigaction(SIGTERM, &sa, NULL);
+ #endif
+ 	signal(SIGALRM, sigAlarm);
+ 	signal(SIGUSR1, sigUsr1);
diff --git a/x11-apps/xinit/xinit-0.99.4.ebuild b/x11-apps/xinit/xinit-0.99.4.ebuild
new file mode 100644
index 000000000000..eb8db1441b34
--- /dev/null
+++ b/x11-apps/xinit/xinit-0.99.4.ebuild
@@ -0,0 +1,41 @@
+# 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/xkbcomp/ChangeLog b/x11-apps/xkbcomp/ChangeLog
index c7813bf3c1c8..f95ecff8ea42 100644
--- a/x11-apps/xkbcomp/ChangeLog
+++ b/x11-apps/xkbcomp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2005/10/20 21:54:59 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.13 2005/12/04 22:07:18 joshuabaergen Exp $
+
+*xkbcomp-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkbcomp-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xkbcomp-0.99.1-r1 (20 Oct 2005)
 
diff --git a/x11-apps/xkbcomp/files/digest-xkbcomp-0.99.2 b/x11-apps/xkbcomp/files/digest-xkbcomp-0.99.2
new file mode 100644
index 000000000000..594e675132d0
--- /dev/null
+++ b/x11-apps/xkbcomp/files/digest-xkbcomp-0.99.2
@@ -0,0 +1 @@
+MD5 9b6984a2cfb2eaf272fc39b0cdcd56e3 xkbcomp-0.99.2.tar.bz2 176458
diff --git a/x11-apps/xkbcomp/xkbcomp-0.99.2.ebuild b/x11-apps/xkbcomp/xkbcomp-0.99.2.ebuild
new file mode 100644
index 000000000000..dc5f169aa057
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-0.99.2.ebuild
@@ -0,0 +1,21 @@
+# 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/xkbevd/ChangeLog b/x11-apps/xkbevd/ChangeLog
index 9f56d6d2401c..8fcdc0b6ff7b 100644
--- a/x11-apps/xkbevd/ChangeLog
+++ b/x11-apps/xkbevd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2005/11/11 19:56:07 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/ChangeLog,v 1.6 2005/12/04 22:07:43 joshuabaergen Exp $
+
+*xkbevd-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkbevd-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xkbevd-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xkbevd/files/digest-xkbevd-0.99.3 b/x11-apps/xkbevd/files/digest-xkbevd-0.99.3
new file mode 100644
index 000000000000..314a215cdc5e
--- /dev/null
+++ b/x11-apps/xkbevd/files/digest-xkbevd-0.99.3
@@ -0,0 +1 @@
+MD5 1053861185d47b8d87a64c1b89acacb2 xkbevd-0.99.3.tar.bz2 100954
diff --git a/x11-apps/xkbevd/xkbevd-0.99.3.ebuild b/x11-apps/xkbevd/xkbevd-0.99.3.ebuild
new file mode 100644
index 000000000000..806823682101
--- /dev/null
+++ b/x11-apps/xkbevd/xkbevd-0.99.3.ebuild
@@ -0,0 +1,13 @@
+# 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/xkbprint/ChangeLog b/x11-apps/xkbprint/ChangeLog
index 3c68a607de70..e5fe17fe4086 100644
--- a/x11-apps/xkbprint/ChangeLog
+++ b/x11-apps/xkbprint/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2005/11/17 13:32:27 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbprint/ChangeLog,v 1.6 2005/12/04 22:08:12 joshuabaergen Exp $
+
+*xkbprint-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkbprint-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xkbprint-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xkbprint/files/digest-xkbprint-0.99.2 b/x11-apps/xkbprint/files/digest-xkbprint-0.99.2
new file mode 100644
index 000000000000..d2e9ce8743b7
--- /dev/null
+++ b/x11-apps/xkbprint/files/digest-xkbprint-0.99.2
@@ -0,0 +1 @@
+MD5 ff363cd429fd03bb3a686a3159daceec xkbprint-0.99.2.tar.bz2 113971
diff --git a/x11-apps/xkbprint/xkbprint-0.99.2.ebuild b/x11-apps/xkbprint/xkbprint-0.99.2.ebuild
new file mode 100644
index 000000000000..80d2a3326c28
--- /dev/null
+++ b/x11-apps/xkbprint/xkbprint-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# 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/xkbutils/ChangeLog b/x11-apps/xkbutils/ChangeLog
index a1a80f0d8a6c..8b49633e2f9a 100644
--- a/x11-apps/xkbutils/ChangeLog
+++ b/x11-apps/xkbutils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2005/11/17 13:35:34 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/ChangeLog,v 1.6 2005/12/04 22:08:37 joshuabaergen Exp $
+
+*xkbutils-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkbutils-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xkbutils-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xkbutils/files/digest-xkbutils-0.99.2 b/x11-apps/xkbutils/files/digest-xkbutils-0.99.2
new file mode 100644
index 000000000000..b74cd0dca752
--- /dev/null
+++ b/x11-apps/xkbutils/files/digest-xkbutils-0.99.2
@@ -0,0 +1 @@
+MD5 24177761ac1fd1ac1443f0f6c328af39 xkbutils-0.99.2.tar.bz2 64614
diff --git a/x11-apps/xkbutils/xkbutils-0.99.2.ebuild b/x11-apps/xkbutils/xkbutils-0.99.2.ebuild
new file mode 100644
index 000000000000..ead162fff86c
--- /dev/null
+++ b/x11-apps/xkbutils/xkbutils-0.99.2.ebuild
@@ -0,0 +1,23 @@
+# 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/xkill/ChangeLog b/x11-apps/xkill/ChangeLog
index a5dc7418d605..3ecda63f8b45 100644
--- a/x11-apps/xkill/ChangeLog
+++ b/x11-apps/xkill/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xkill
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/ChangeLog,v 1.5 2005/11/17 13:30:54 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/ChangeLog,v 1.6 2005/12/04 22:09:08 joshuabaergen Exp $
+
+*xkill-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkill-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xkill-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xkill/files/digest-xkill-0.99.2 b/x11-apps/xkill/files/digest-xkill-0.99.2
new file mode 100644
index 000000000000..25909188c2cc
--- /dev/null
+++ b/x11-apps/xkill/files/digest-xkill-0.99.2
@@ -0,0 +1 @@
+MD5 bfe44de60770d1ad4f4568b75d8934b8 xkill-0.99.2.tar.bz2 75965
diff --git a/x11-apps/xkill/xkill-0.99.2.ebuild b/x11-apps/xkill/xkill-0.99.2.ebuild
new file mode 100644
index 000000000000..b48663e335cf
--- /dev/null
+++ b/x11-apps/xkill/xkill-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/xkill-0.99.2.ebuild,v 1.1 2005/12/04 22:09:08 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xkill application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xload/ChangeLog b/x11-apps/xload/ChangeLog
index f43004c67579..6b8ffcf81a3d 100644
--- a/x11-apps/xload/ChangeLog
+++ b/x11-apps/xload/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xload
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/ChangeLog,v 1.5 2005/11/17 13:37:11 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/ChangeLog,v 1.6 2005/12/04 22:09:43 joshuabaergen Exp $
+
+*xload-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xload-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xload-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xload/files/digest-xload-0.99.2 b/x11-apps/xload/files/digest-xload-0.99.2
new file mode 100644
index 000000000000..e165982d5470
--- /dev/null
+++ b/x11-apps/xload/files/digest-xload-0.99.2
@@ -0,0 +1 @@
+MD5 c95cc92f24d7c654f6c572c4b4fe3e2c xload-0.99.2.tar.bz2 85824
diff --git a/x11-apps/xload/xload-0.99.2.ebuild b/x11-apps/xload/xload-0.99.2.ebuild
new file mode 100644
index 000000000000..c95a44c9a4b7
--- /dev/null
+++ b/x11-apps/xload/xload-0.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/xload-0.99.2.ebuild,v 1.1 2005/12/04 22:09:43 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xload application"
+KEYWORDS="~amd64 ~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/xlogo/ChangeLog b/x11-apps/xlogo/ChangeLog
index 2dc32ac80023..18f497318c80 100644
--- a/x11-apps/xlogo/ChangeLog
+++ b/x11-apps/xlogo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xlogo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/ChangeLog,v 1.5 2005/11/17 13:38:28 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/ChangeLog,v 1.6 2005/12/04 22:10:18 joshuabaergen Exp $
+
+*xlogo-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xlogo-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xlogo-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xlogo/files/digest-xlogo-0.99.2 b/x11-apps/xlogo/files/digest-xlogo-0.99.2
new file mode 100644
index 000000000000..ecacb193e7ef
--- /dev/null
+++ b/x11-apps/xlogo/files/digest-xlogo-0.99.2
@@ -0,0 +1 @@
+MD5 cfd0edf86d457e34af01fdaab36eeb03 xlogo-0.99.2.tar.bz2 85470
diff --git a/x11-apps/xlogo/xlogo-0.99.2.ebuild b/x11-apps/xlogo/xlogo-0.99.2.ebuild
new file mode 100644
index 000000000000..4b09855dfb15
--- /dev/null
+++ b/x11-apps/xlogo/xlogo-0.99.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/xlogo-0.99.2.ebuild,v 1.1 2005/12/04 22:10:18 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xlogo application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+# Broken without xprint
+#IUSE="xprint"
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXaw
+	x11-libs/libXprintUtil"
+#	xprint? ( x11-libs/libXprintUtil )"
+DEPEND="${RDEPEND}"
+
+#CONFIGURE_OPTIONS="$(use_enable xprint)"
diff --git a/x11-apps/xlsatoms/ChangeLog b/x11-apps/xlsatoms/ChangeLog
index 6fcb8d58953c..1b430ef61b48 100644
--- a/x11-apps/xlsatoms/ChangeLog
+++ b/x11-apps/xlsatoms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xlsatoms
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/ChangeLog,v 1.5 2005/11/17 13:39:54 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/ChangeLog,v 1.6 2005/12/04 22:10:45 joshuabaergen Exp $
+
+*xlsatoms-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xlsatoms-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xlsatoms-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xlsatoms/files/digest-xlsatoms-0.99.2 b/x11-apps/xlsatoms/files/digest-xlsatoms-0.99.2
new file mode 100644
index 000000000000..9811e0e424e8
--- /dev/null
+++ b/x11-apps/xlsatoms/files/digest-xlsatoms-0.99.2
@@ -0,0 +1 @@
+MD5 9e7d96a4060dbd4483ba07f4a0fd324c xlsatoms-0.99.2.tar.bz2 73635
diff --git a/x11-apps/xlsatoms/xlsatoms-0.99.2.ebuild b/x11-apps/xlsatoms/xlsatoms-0.99.2.ebuild
new file mode 100644
index 000000000000..39f654e8c3db
--- /dev/null
+++ b/x11-apps/xlsatoms/xlsatoms-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/xlsatoms-0.99.2.ebuild,v 1.1 2005/12/04 22:10:45 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xlsatoms application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsclients/ChangeLog b/x11-apps/xlsclients/ChangeLog
index c74c225c4c9c..1eaeb6da1fa1 100644
--- a/x11-apps/xlsclients/ChangeLog
+++ b/x11-apps/xlsclients/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xlsclients
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/ChangeLog,v 1.5 2005/11/17 13:40:21 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/ChangeLog,v 1.6 2005/12/04 22:11:11 joshuabaergen Exp $
+
+*xlsclients-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xlsclients-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xlsclients-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xlsclients/files/digest-xlsclients-0.99.2 b/x11-apps/xlsclients/files/digest-xlsclients-0.99.2
new file mode 100644
index 000000000000..c4be7e874a2d
--- /dev/null
+++ b/x11-apps/xlsclients/files/digest-xlsclients-0.99.2
@@ -0,0 +1 @@
+MD5 3b05bf9e4e01bd89bf5f60b34834d890 xlsclients-0.99.2.tar.bz2 74265
diff --git a/x11-apps/xlsclients/xlsclients-0.99.2.ebuild b/x11-apps/xlsclients/xlsclients-0.99.2.ebuild
new file mode 100644
index 000000000000..36ef3b576086
--- /dev/null
+++ b/x11-apps/xlsclients/xlsclients-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-0.99.2.ebuild,v 1.1 2005/12/04 22:11:11 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xlsclients application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsfonts/ChangeLog b/x11-apps/xlsfonts/ChangeLog
index d2ce90dac21b..603d53966ead 100644
--- a/x11-apps/xlsfonts/ChangeLog
+++ b/x11-apps/xlsfonts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xlsfonts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsfonts/ChangeLog,v 1.5 2005/11/06 18:47:19 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsfonts/ChangeLog,v 1.6 2005/12/04 22:11:41 joshuabaergen Exp $
+
+*xlsfonts-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xlsfonts-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   06 Nov 2005; <dang@gentoo.org> xlsfonts-0.99.1.ebuild:
   Marked ~amd64
diff --git a/x11-apps/xlsfonts/files/digest-xlsfonts-0.99.2 b/x11-apps/xlsfonts/files/digest-xlsfonts-0.99.2
new file mode 100644
index 000000000000..3192070fc2ee
--- /dev/null
+++ b/x11-apps/xlsfonts/files/digest-xlsfonts-0.99.2
@@ -0,0 +1 @@
+MD5 b69f32ffd70fff3fe38c6dd09efdabfe xlsfonts-0.99.2.tar.bz2 86529
diff --git a/x11-apps/xlsfonts/xlsfonts-0.99.2.ebuild b/x11-apps/xlsfonts/xlsfonts-0.99.2.ebuild
new file mode 100644
index 000000000000..82ccbdb28847
--- /dev/null
+++ b/x11-apps/xlsfonts/xlsfonts-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsfonts/xlsfonts-0.99.2.ebuild,v 1.1 2005/12/04 22:11:41 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xlsfonts application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmag/ChangeLog b/x11-apps/xmag/ChangeLog
index d72e1e13fa0e..8c663f14cd3c 100644
--- a/x11-apps/xmag/ChangeLog
+++ b/x11-apps/xmag/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xmag
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmag/ChangeLog,v 1.5 2005/11/17 13:41:44 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmag/ChangeLog,v 1.6 2005/12/04 22:12:07 joshuabaergen Exp $
+
+*xmag-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xmag-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xmag-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xmag/files/digest-xmag-0.99.2 b/x11-apps/xmag/files/digest-xmag-0.99.2
new file mode 100644
index 000000000000..a0921d485192
--- /dev/null
+++ b/x11-apps/xmag/files/digest-xmag-0.99.2
@@ -0,0 +1 @@
+MD5 3712619f2096587dbdcdac7385ebbd6d xmag-0.99.2.tar.bz2 92037
diff --git a/x11-apps/xmag/xmag-0.99.2.ebuild b/x11-apps/xmag/xmag-0.99.2.ebuild
new file mode 100644
index 000000000000..673f938e28a7
--- /dev/null
+++ b/x11-apps/xmag/xmag-0.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmag/xmag-0.99.2.ebuild,v 1.1 2005/12/04 22:12:07 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xmag application"
+KEYWORDS="~amd64 ~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/xman/ChangeLog b/x11-apps/xman/ChangeLog
index 60cce7a003bc..4c1939382e5c 100644
--- a/x11-apps/xman/ChangeLog
+++ b/x11-apps/xman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xman
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/ChangeLog,v 1.6 2005/11/17 13:42:58 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/ChangeLog,v 1.7 2005/12/04 22:12:37 joshuabaergen Exp $
+
+*xman-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xman-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xman-0.99.2.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xman/files/digest-xman-0.99.3 b/x11-apps/xman/files/digest-xman-0.99.3
new file mode 100644
index 000000000000..4d5999f08997
--- /dev/null
+++ b/x11-apps/xman/files/digest-xman-0.99.3
@@ -0,0 +1 @@
+MD5 0bd1276f1b105148eba05374ca42789d xman-0.99.3.tar.bz2 131853
diff --git a/x11-apps/xman/xman-0.99.3.ebuild b/x11-apps/xman/xman-0.99.3.ebuild
new file mode 100644
index 000000000000..2646144c201b
--- /dev/null
+++ b/x11-apps/xman/xman-0.99.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/xman-0.99.3.ebuild,v 1.1 2005/12/04 22:12:37 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xman application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+# Broken without xprint
+IUSE="xprint"
+RDEPEND="xprint? ( x11-libs/libXprintUtil )"
+#x11-libs/libXprintUtil"
+DEPEND="${RDEPEND}"
+
+CONFIGURE_OPTIONS="$(use_enable xprint)"
diff --git a/x11-apps/xmessage/ChangeLog b/x11-apps/xmessage/ChangeLog
index 074cd65e1485..70dfddb03876 100644
--- a/x11-apps/xmessage/ChangeLog
+++ b/x11-apps/xmessage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xmessage
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmessage/ChangeLog,v 1.5 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmessage/ChangeLog,v 1.6 2005/12/04 22:13:08 joshuabaergen Exp $
+
+*xmessage-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xmessage-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xmessage-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xmessage/files/digest-xmessage-0.99.2 b/x11-apps/xmessage/files/digest-xmessage-0.99.2
new file mode 100644
index 000000000000..4bceb3a92e03
--- /dev/null
+++ b/x11-apps/xmessage/files/digest-xmessage-0.99.2
@@ -0,0 +1 @@
+MD5 dd32e7c1e4af23c3b001e530b5707f68 xmessage-0.99.2.tar.bz2 81781
diff --git a/x11-apps/xmessage/xmessage-0.99.2.ebuild b/x11-apps/xmessage/xmessage-0.99.2.ebuild
new file mode 100644
index 000000000000..762cc2b76887
--- /dev/null
+++ b/x11-apps/xmessage/xmessage-0.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmessage/xmessage-0.99.2.ebuild,v 1.1 2005/12/04 22:13:08 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xmessage application"
+KEYWORDS="~amd64 ~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/xmh/ChangeLog b/x11-apps/xmh/ChangeLog
index d1713954c266..e398eb7d44d8 100644
--- a/x11-apps/xmh/ChangeLog
+++ b/x11-apps/xmh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xmh
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmh/ChangeLog,v 1.5 2005/11/11 19:57:59 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmh/ChangeLog,v 1.6 2005/12/04 22:13:38 joshuabaergen Exp $
+
+*xmh-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xmh-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xmh-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xmh/files/digest-xmh-0.99.3 b/x11-apps/xmh/files/digest-xmh-0.99.3
new file mode 100644
index 000000000000..4b96aec5ea48
--- /dev/null
+++ b/x11-apps/xmh/files/digest-xmh-0.99.3
@@ -0,0 +1 @@
+MD5 c7819c7b6f2ad39f8404d05645d8ecaa xmh-0.99.3.tar.bz2 151460
diff --git a/x11-apps/xmh/xmh-0.99.3.ebuild b/x11-apps/xmh/xmh-0.99.3.ebuild
new file mode 100644
index 000000000000..f3dd055305dd
--- /dev/null
+++ b/x11-apps/xmh/xmh-0.99.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmh/xmh-0.99.3.ebuild,v 1.1 2005/12/04 22:13:38 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xmh 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/xmodmap/ChangeLog b/x11-apps/xmodmap/ChangeLog
index f2095f11a504..8b02fe2f236b 100644
--- a/x11-apps/xmodmap/ChangeLog
+++ b/x11-apps/xmodmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xmodmap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/ChangeLog,v 1.5 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/ChangeLog,v 1.6 2005/12/04 22:14:14 joshuabaergen Exp $
+
+*xmodmap-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xmodmap-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xmodmap-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xmodmap/files/digest-xmodmap-0.99.2 b/x11-apps/xmodmap/files/digest-xmodmap-0.99.2
new file mode 100644
index 000000000000..3cc0b54cfe49
--- /dev/null
+++ b/x11-apps/xmodmap/files/digest-xmodmap-0.99.2
@@ -0,0 +1 @@
+MD5 e9807c74d11d256447857deb85762f16 xmodmap-0.99.2.tar.bz2 88709
diff --git a/x11-apps/xmodmap/xmodmap-0.99.2.ebuild b/x11-apps/xmodmap/xmodmap-0.99.2.ebuild
new file mode 100644
index 000000000000..3abd4b192af8
--- /dev/null
+++ b/x11-apps/xmodmap/xmodmap-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-0.99.2.ebuild,v 1.1 2005/12/04 22:14:14 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xwud application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmore/ChangeLog b/x11-apps/xmore/ChangeLog
index 75c9490504e9..73651e8f746b 100644
--- a/x11-apps/xmore/ChangeLog
+++ b/x11-apps/xmore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xmore
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/ChangeLog,v 1.4 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/ChangeLog,v 1.5 2005/12/04 22:14:40 joshuabaergen Exp $
+
+*xmore-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xmore-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xmore-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xmore/files/digest-xmore-0.99.2 b/x11-apps/xmore/files/digest-xmore-0.99.2
new file mode 100644
index 000000000000..649be1c282e1
--- /dev/null
+++ b/x11-apps/xmore/files/digest-xmore-0.99.2
@@ -0,0 +1 @@
+MD5 8d5840d3cd8799ccb9fe499131e4a022 xmore-0.99.2.tar.bz2 90433
diff --git a/x11-apps/xmore/xmore-0.99.2.ebuild b/x11-apps/xmore/xmore-0.99.2.ebuild
new file mode 100644
index 000000000000..3d4cc6307abb
--- /dev/null
+++ b/x11-apps/xmore/xmore-0.99.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/xmore-0.99.2.ebuild,v 1.1 2005/12/04 22:14:40 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xmore application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+# Broken without xprint
+IUSE="xprint"
+RDEPEND="xprint? ( x11-libs/libXprintUtil )"
+#x11-libs/libXprintUtil"
+DEPEND="${RDEPEND}"
+
+CONFIGURE_OPTIONS="$(use_enable xprint)"
diff --git a/x11-apps/xphelloworld/ChangeLog b/x11-apps/xphelloworld/ChangeLog
index 38d398de45cc..e7586195209e 100644
--- a/x11-apps/xphelloworld/ChangeLog
+++ b/x11-apps/xphelloworld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xphelloworld
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xphelloworld/ChangeLog,v 1.4 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xphelloworld/ChangeLog,v 1.5 2005/12/04 22:15:06 joshuabaergen Exp $
+
+*xphelloworld-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xphelloworld-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xphelloworld-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xphelloworld/files/digest-xphelloworld-0.99.2 b/x11-apps/xphelloworld/files/digest-xphelloworld-0.99.2
new file mode 100644
index 000000000000..f29083148aef
--- /dev/null
+++ b/x11-apps/xphelloworld/files/digest-xphelloworld-0.99.2
@@ -0,0 +1 @@
+MD5 740b6a82429d57029ee59244df7348d2 xphelloworld-0.99.2.tar.bz2 71921
diff --git a/x11-apps/xphelloworld/xphelloworld-0.99.2.ebuild b/x11-apps/xphelloworld/xphelloworld-0.99.2.ebuild
new file mode 100644
index 000000000000..6f6ed37a1256
--- /dev/null
+++ b/x11-apps/xphelloworld/xphelloworld-0.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xphelloworld/xphelloworld-0.99.2.ebuild,v 1.1 2005/12/04 22:15:06 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xphelloworld application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXprintUtil
+	x11-libs/libXprintAppUtil
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/libXaw xprint; then
+		die "Build x11-libs/libXaw with USE=xprint."
+	fi
+}
diff --git a/x11-apps/xplsprinters/ChangeLog b/x11-apps/xplsprinters/ChangeLog
index 803997545c76..6190f99652b5 100644
--- a/x11-apps/xplsprinters/ChangeLog
+++ b/x11-apps/xplsprinters/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xplsprinters
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xplsprinters/ChangeLog,v 1.4 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xplsprinters/ChangeLog,v 1.5 2005/12/04 22:15:41 joshuabaergen Exp $
+
+*xplsprinters-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xplsprinters-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xplsprinters-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xplsprinters/files/digest-xplsprinters-0.99.2 b/x11-apps/xplsprinters/files/digest-xplsprinters-0.99.2
new file mode 100644
index 000000000000..1c920ec817a9
--- /dev/null
+++ b/x11-apps/xplsprinters/files/digest-xplsprinters-0.99.2
@@ -0,0 +1 @@
+MD5 6a3d095f4358b739e08611c29c8a48b9 xplsprinters-0.99.2.tar.bz2 76033
diff --git a/x11-apps/xplsprinters/xplsprinters-0.99.2.ebuild b/x11-apps/xplsprinters/xplsprinters-0.99.2.ebuild
new file mode 100644
index 000000000000..3dbb04139867
--- /dev/null
+++ b/x11-apps/xplsprinters/xplsprinters-0.99.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xplsprinters/xplsprinters-0.99.2.ebuild,v 1.1 2005/12/04 22:15:41 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xplsprinters application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXp
+	x11-libs/libXprintUtil"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xpr/ChangeLog b/x11-apps/xpr/ChangeLog
index e12107d96aca..7557374a4411 100644
--- a/x11-apps/xpr/ChangeLog
+++ b/x11-apps/xpr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xpr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/ChangeLog,v 1.4 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/ChangeLog,v 1.5 2005/12/04 22:17:07 joshuabaergen Exp $
+
+*xpr-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xpr-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xpr-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xpr/files/digest-xpr-0.99.2 b/x11-apps/xpr/files/digest-xpr-0.99.2
new file mode 100644
index 000000000000..ac5fef292c9c
--- /dev/null
+++ b/x11-apps/xpr/files/digest-xpr-0.99.2
@@ -0,0 +1 @@
+MD5 763ed298618509870499ba190ed8770d xpr-0.99.2.tar.bz2 106354
diff --git a/x11-apps/xpr/xpr-0.99.2.ebuild b/x11-apps/xpr/xpr-0.99.2.ebuild
new file mode 100644
index 000000000000..07c52e704cf3
--- /dev/null
+++ b/x11-apps/xpr/xpr-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/xpr-0.99.2.ebuild,v 1.1 2005/12/04 22:17:07 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xpr application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xprehashprinterlist/ChangeLog b/x11-apps/xprehashprinterlist/ChangeLog
index a0a72c206810..3d2b9be5e69e 100644
--- a/x11-apps/xprehashprinterlist/ChangeLog
+++ b/x11-apps/xprehashprinterlist/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xprehashprinterlist
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprehashprinterlist/ChangeLog,v 1.4 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprehashprinterlist/ChangeLog,v 1.5 2005/12/04 22:16:13 joshuabaergen Exp $
+
+*xprehashprinterlist-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xprehashprinterlist-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xprehashprinterlist-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xprehashprinterlist/files/digest-xprehashprinterlist-0.99.2 b/x11-apps/xprehashprinterlist/files/digest-xprehashprinterlist-0.99.2
new file mode 100644
index 000000000000..6c11aaf239ab
--- /dev/null
+++ b/x11-apps/xprehashprinterlist/files/digest-xprehashprinterlist-0.99.2
@@ -0,0 +1 @@
+MD5 fbc8963bf3ae77783012925d55f04434 xprehashprinterlist-0.99.2.tar.bz2 74371
diff --git a/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.2.ebuild b/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.2.ebuild
new file mode 100644
index 000000000000..2c0b4d8ca32d
--- /dev/null
+++ b/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.2.ebuild,v 1.1 2005/12/04 22:16:13 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xprehashprinterlist application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXp"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xprop/ChangeLog b/x11-apps/xprop/ChangeLog
index a7f68644908e..52cc318b4cd7 100644
--- a/x11-apps/xprop/ChangeLog
+++ b/x11-apps/xprop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xprop
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/ChangeLog,v 1.5 2005/10/29 10:44:04 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/ChangeLog,v 1.6 2005/12/04 22:16:38 joshuabaergen Exp $
+
+*xprop-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xprop-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   29 Oct 2005; Herbie Hopkins <herbs@gentoo.org> xprop-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xprop/files/digest-xprop-0.99.2 b/x11-apps/xprop/files/digest-xprop-0.99.2
new file mode 100644
index 000000000000..c31ddcd7867d
--- /dev/null
+++ b/x11-apps/xprop/files/digest-xprop-0.99.2
@@ -0,0 +1 @@
+MD5 edf6834512b6b26e8d0e970b1112994b xprop-0.99.2.tar.bz2 91442
diff --git a/x11-apps/xprop/xprop-0.99.2.ebuild b/x11-apps/xprop/xprop-0.99.2.ebuild
new file mode 100644
index 000000000000..5097ecb102a4
--- /dev/null
+++ b/x11-apps/xprop/xprop-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-0.99.2.ebuild,v 1.1 2005/12/04 22:16:38 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xprop application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrandr/ChangeLog b/x11-apps/xrandr/ChangeLog
index db65b4378509..17bb31940c00 100644
--- a/x11-apps/xrandr/ChangeLog
+++ b/x11-apps/xrandr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xrandr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/ChangeLog,v 1.5 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/ChangeLog,v 1.6 2005/12/04 22:17:33 joshuabaergen Exp $
+
+*xrandr-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xrandr-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xrandr-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xrandr/files/digest-xrandr-0.99.2 b/x11-apps/xrandr/files/digest-xrandr-0.99.2
new file mode 100644
index 000000000000..e349ce35a79f
--- /dev/null
+++ b/x11-apps/xrandr/files/digest-xrandr-0.99.2
@@ -0,0 +1 @@
+MD5 a2568462f7d228f1ec1403d1e4c1ff1f xrandr-0.99.2.tar.bz2 75006
diff --git a/x11-apps/xrandr/xrandr-0.99.2.ebuild b/x11-apps/xrandr/xrandr-0.99.2.ebuild
new file mode 100644
index 000000000000..11df89862fce
--- /dev/null
+++ b/x11-apps/xrandr/xrandr-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-0.99.2.ebuild,v 1.1 2005/12/04 22:17:33 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xrandr application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrdb/ChangeLog b/x11-apps/xrdb/ChangeLog
index 2b75ddc048bd..7887d9f8147a 100644
--- a/x11-apps/xrdb/ChangeLog
+++ b/x11-apps/xrdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xrdb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/ChangeLog,v 1.6 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/ChangeLog,v 1.7 2005/12/04 22:18:01 joshuabaergen Exp $
+
+*xrdb-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xrdb-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xrdb-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xrdb/files/digest-xrdb-0.99.2 b/x11-apps/xrdb/files/digest-xrdb-0.99.2
new file mode 100644
index 000000000000..6983331f7d12
--- /dev/null
+++ b/x11-apps/xrdb/files/digest-xrdb-0.99.2
@@ -0,0 +1 @@
+MD5 2801e13462c2194821c3f5ef446261cd xrdb-0.99.2.tar.bz2 84343
diff --git a/x11-apps/xrdb/xrdb-0.99.2.ebuild b/x11-apps/xrdb/xrdb-0.99.2.ebuild
new file mode 100644
index 000000000000..a309478754dd
--- /dev/null
+++ b/x11-apps/xrdb/xrdb-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/xrdb-0.99.2.ebuild,v 1.1 2005/12/04 22:18:01 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xrdb application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrefresh/ChangeLog b/x11-apps/xrefresh/ChangeLog
index e3f8adc4466b..88d61b674655 100644
--- a/x11-apps/xrefresh/ChangeLog
+++ b/x11-apps/xrefresh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xrefresh
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrefresh/ChangeLog,v 1.5 2005/11/17 13:43:38 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrefresh/ChangeLog,v 1.6 2005/12/04 22:18:26 joshuabaergen Exp $
+
+*xrefresh-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xrefresh-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xrefresh-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xrefresh/files/digest-xrefresh-0.99.2 b/x11-apps/xrefresh/files/digest-xrefresh-0.99.2
new file mode 100644
index 000000000000..f8485c4f8cb1
--- /dev/null
+++ b/x11-apps/xrefresh/files/digest-xrefresh-0.99.2
@@ -0,0 +1 @@
+MD5 3f7673415109b5fb2e554af8e1d302d3 xrefresh-0.99.2.tar.bz2 75214
diff --git a/x11-apps/xrefresh/xrefresh-0.99.2.ebuild b/x11-apps/xrefresh/xrefresh-0.99.2.ebuild
new file mode 100644
index 000000000000..e810c715d327
--- /dev/null
+++ b/x11-apps/xrefresh/xrefresh-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrefresh/xrefresh-0.99.2.ebuild,v 1.1 2005/12/04 22:18:26 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xrefresh application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrx/ChangeLog b/x11-apps/xrx/ChangeLog
index 24f3abc38658..015a8b8e7538 100644
--- a/x11-apps/xrx/ChangeLog
+++ b/x11-apps/xrx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xrx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrx/ChangeLog,v 1.4 2005/11/11 19:58:23 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrx/ChangeLog,v 1.5 2005/12/04 22:18:54 joshuabaergen Exp $
+
+*xrx-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xrx-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xrx-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xrx/files/digest-xrx-0.99.3 b/x11-apps/xrx/files/digest-xrx-0.99.3
new file mode 100644
index 000000000000..a06621804007
--- /dev/null
+++ b/x11-apps/xrx/files/digest-xrx-0.99.3
@@ -0,0 +1 @@
+MD5 789e76a1ead048d8ec782d92f7f16583 xrx-0.99.3.tar.bz2 228419
diff --git a/x11-apps/xrx/xrx-0.99.3.ebuild b/x11-apps/xrx/xrx-0.99.3.ebuild
new file mode 100644
index 000000000000..a347a75b32ab
--- /dev/null
+++ b/x11-apps/xrx/xrx-0.99.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrx/xrx-0.99.3.ebuild,v 1.1 2005/12/04 22:18:54 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xrx application"
+KEYWORDS="~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
+IUSE="ipv6"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-apps/xset/ChangeLog b/x11-apps/xset/ChangeLog
index 7c99fa550584..e840ac6d730c 100644
--- a/x11-apps/xset/ChangeLog
+++ b/x11-apps/xset/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xset
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/ChangeLog,v 1.10 2005/11/11 19:59:23 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/ChangeLog,v 1.11 2005/12/04 22:20:53 joshuabaergen Exp $
+
+*xset-0.99.4 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xset-0.99.4.ebuild:
+  Bump for 7.0RC3.
 
 *xset-0.99.3 (11 Nov 2005)
 
diff --git a/x11-apps/xset/files/digest-xset-0.99.4 b/x11-apps/xset/files/digest-xset-0.99.4
new file mode 100644
index 000000000000..ab87c8d94208
--- /dev/null
+++ b/x11-apps/xset/files/digest-xset-0.99.4
@@ -0,0 +1 @@
+MD5 1b9028c139e8611e357f18bbafa6b1c0 xset-0.99.4.tar.bz2 87361
diff --git a/x11-apps/xset/xset-0.99.4.ebuild b/x11-apps/xset/xset-0.99.4.ebuild
new file mode 100644
index 000000000000..301dbbad3208
--- /dev/null
+++ b/x11-apps/xset/xset-0.99.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/xset-0.99.4.ebuild,v 1.1 2005/12/04 22:20:53 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xset application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsetmode/ChangeLog b/x11-apps/xsetmode/ChangeLog
index 26fe2fbc4b2d..db1661066f89 100644
--- a/x11-apps/xsetmode/ChangeLog
+++ b/x11-apps/xsetmode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xsetmode
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetmode/ChangeLog,v 1.4 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetmode/ChangeLog,v 1.5 2005/12/04 22:19:21 joshuabaergen Exp $
+
+*xsetmode-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xsetmode-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xsetmode-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xsetmode/files/digest-xsetmode-0.99.2 b/x11-apps/xsetmode/files/digest-xsetmode-0.99.2
new file mode 100644
index 000000000000..cb0b195354b6
--- /dev/null
+++ b/x11-apps/xsetmode/files/digest-xsetmode-0.99.2
@@ -0,0 +1 @@
+MD5 87c62ae43c026e09c677f71d08466420 xsetmode-0.99.2.tar.bz2 72719
diff --git a/x11-apps/xsetmode/xsetmode-0.99.2.ebuild b/x11-apps/xsetmode/xsetmode-0.99.2.ebuild
new file mode 100644
index 000000000000..e183f3b25067
--- /dev/null
+++ b/x11-apps/xsetmode/xsetmode-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetmode/xsetmode-0.99.2.ebuild,v 1.1 2005/12/04 22:19:21 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xsetmode application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXi
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsetpointer/ChangeLog b/x11-apps/xsetpointer/ChangeLog
index e748b7c8f9d1..a3e4b86b5b0e 100644
--- a/x11-apps/xsetpointer/ChangeLog
+++ b/x11-apps/xsetpointer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xsetpointer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetpointer/ChangeLog,v 1.5 2005/11/11 19:58:53 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetpointer/ChangeLog,v 1.6 2005/12/04 22:19:53 joshuabaergen Exp $
+
+*xsetpointer-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xsetpointer-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xsetpointer-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xsetpointer/files/digest-xsetpointer-0.99.3 b/x11-apps/xsetpointer/files/digest-xsetpointer-0.99.3
new file mode 100644
index 000000000000..b96d6f1ab414
--- /dev/null
+++ b/x11-apps/xsetpointer/files/digest-xsetpointer-0.99.3
@@ -0,0 +1 @@
+MD5 4592cb12d327a395fc902a6bc491baf0 xsetpointer-0.99.3.tar.bz2 72866
diff --git a/x11-apps/xsetpointer/xsetpointer-0.99.3.ebuild b/x11-apps/xsetpointer/xsetpointer-0.99.3.ebuild
new file mode 100644
index 000000000000..9a0a7d978ba8
--- /dev/null
+++ b/x11-apps/xsetpointer/xsetpointer-0.99.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetpointer/xsetpointer-0.99.3.ebuild,v 1.1 2005/12/04 22:19:53 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xsetpointer application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXi
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsetroot/ChangeLog b/x11-apps/xsetroot/ChangeLog
index ff5d616968fd..3a23649dd31e 100644
--- a/x11-apps/xsetroot/ChangeLog
+++ b/x11-apps/xsetroot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xsetroot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetroot/ChangeLog,v 1.5 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetroot/ChangeLog,v 1.6 2005/12/04 22:20:19 joshuabaergen Exp $
+
+*xsetroot-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xsetroot-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xsetroot-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xsetroot/files/digest-xsetroot-0.99.2 b/x11-apps/xsetroot/files/digest-xsetroot-0.99.2
new file mode 100644
index 000000000000..90fcfbf55000
--- /dev/null
+++ b/x11-apps/xsetroot/files/digest-xsetroot-0.99.2
@@ -0,0 +1 @@
+MD5 f3fad277408d283266b17c3695a3c888 xsetroot-0.99.2.tar.bz2 76517
diff --git a/x11-apps/xsetroot/xsetroot-0.99.2.ebuild b/x11-apps/xsetroot/xsetroot-0.99.2.ebuild
new file mode 100644
index 000000000000..abd1188d5de3
--- /dev/null
+++ b/x11-apps/xsetroot/xsetroot-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetroot/xsetroot-0.99.2.ebuild,v 1.1 2005/12/04 22:20:19 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xsetroot application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsm/ChangeLog b/x11-apps/xsm/ChangeLog
index f42b665309bb..c96962e0bff8 100644
--- a/x11-apps/xsm/ChangeLog
+++ b/x11-apps/xsm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xsm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/ChangeLog,v 1.5 2005/11/11 20:00:02 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/ChangeLog,v 1.6 2005/12/04 22:21:30 joshuabaergen Exp $
+
+*xsm-0.99.3 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xsm-0.99.3.ebuild:
+  Bump for 7.0RC3.
 
 *xsm-0.99.2 (11 Nov 2005)
 
diff --git a/x11-apps/xsm/files/digest-xsm-0.99.3 b/x11-apps/xsm/files/digest-xsm-0.99.3
new file mode 100644
index 000000000000..553d91e9b708
--- /dev/null
+++ b/x11-apps/xsm/files/digest-xsm-0.99.3
@@ -0,0 +1 @@
+MD5 c3f985ef0615cf2e83045643c901e786 xsm-0.99.3.tar.bz2 115121
diff --git a/x11-apps/xsm/xsm-0.99.3.ebuild b/x11-apps/xsm/xsm-0.99.3.ebuild
new file mode 100644
index 000000000000..1a88fe8c1097
--- /dev/null
+++ b/x11-apps/xsm/xsm-0.99.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/xsm-0.99.3.ebuild,v 1.1 2005/12/04 22:21:30 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xsm application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+IUSE="xprint"
+RDEPEND="x11-libs/libXaw
+	net-misc/netkit-rsh"
+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/xstdcmap/ChangeLog b/x11-apps/xstdcmap/ChangeLog
index 8b0f91dccf75..d7ce5efe7be8 100644
--- a/x11-apps/xstdcmap/ChangeLog
+++ b/x11-apps/xstdcmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xstdcmap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xstdcmap/ChangeLog,v 1.4 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xstdcmap/ChangeLog,v 1.5 2005/12/04 22:21:54 joshuabaergen Exp $
+
+*xstdcmap-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xstdcmap-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xstdcmap-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xstdcmap/files/digest-xstdcmap-0.99.2 b/x11-apps/xstdcmap/files/digest-xstdcmap-0.99.2
new file mode 100644
index 000000000000..43797bf3792a
--- /dev/null
+++ b/x11-apps/xstdcmap/files/digest-xstdcmap-0.99.2
@@ -0,0 +1 @@
+MD5 9656f3ff422c8aff7068ac6b6517d3bb xstdcmap-0.99.2.tar.bz2 75138
diff --git a/x11-apps/xstdcmap/xstdcmap-0.99.2.ebuild b/x11-apps/xstdcmap/xstdcmap-0.99.2.ebuild
new file mode 100644
index 000000000000..dc8591226915
--- /dev/null
+++ b/x11-apps/xstdcmap/xstdcmap-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xstdcmap/xstdcmap-0.99.2.ebuild,v 1.1 2005/12/04 22:21:54 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xstdcmap application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xtrap/ChangeLog b/x11-apps/xtrap/ChangeLog
index ec191a2777cb..c1704b156de6 100644
--- a/x11-apps/xtrap/ChangeLog
+++ b/x11-apps/xtrap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xtrap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xtrap/ChangeLog,v 1.6 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xtrap/ChangeLog,v 1.7 2005/12/04 22:22:20 joshuabaergen Exp $
+
+*xtrap-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xtrap-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xtrap-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xtrap/files/digest-xtrap-0.99.2 b/x11-apps/xtrap/files/digest-xtrap-0.99.2
new file mode 100644
index 000000000000..a6434cb841d0
--- /dev/null
+++ b/x11-apps/xtrap/files/digest-xtrap-0.99.2
@@ -0,0 +1 @@
+MD5 0c94b9b666e121487a8e7b34fd11056e xtrap-0.99.2.tar.bz2 90154
diff --git a/x11-apps/xtrap/xtrap-0.99.2.ebuild b/x11-apps/xtrap/xtrap-0.99.2.ebuild
new file mode 100644
index 000000000000..284a89b41865
--- /dev/null
+++ b/x11-apps/xtrap/xtrap-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xtrap/xtrap-0.99.2.ebuild,v 1.1 2005/12/04 22:22:20 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xtrap application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXTrap"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xvidtune/ChangeLog b/x11-apps/xvidtune/ChangeLog
index 765246c4aa20..2a2cddde5e6b 100644
--- a/x11-apps/xvidtune/ChangeLog
+++ b/x11-apps/xvidtune/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xvidtune
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvidtune/ChangeLog,v 1.4 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvidtune/ChangeLog,v 1.5 2005/12/04 22:22:47 joshuabaergen Exp $
+
+*xvidtune-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xvidtune-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
 *xvidtune-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xvidtune/files/digest-xvidtune-0.99.2 b/x11-apps/xvidtune/files/digest-xvidtune-0.99.2
new file mode 100644
index 000000000000..857a477ed1a3
--- /dev/null
+++ b/x11-apps/xvidtune/files/digest-xvidtune-0.99.2
@@ -0,0 +1 @@
+MD5 5f96b3edeecdccd25a888f44cfdbebfe xvidtune-0.99.2.tar.bz2 86407
diff --git a/x11-apps/xvidtune/xvidtune-0.99.2.ebuild b/x11-apps/xvidtune/xvidtune-0.99.2.ebuild
new file mode 100644
index 000000000000..e8516dbb83f1
--- /dev/null
+++ b/x11-apps/xvidtune/xvidtune-0.99.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvidtune/xvidtune-0.99.2.ebuild,v 1.1 2005/12/04 22:22:47 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xvidtune application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+IUSE="xprint"
+RDEPEND="x11-libs/libXxf86vm
+	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/xvinfo/ChangeLog b/x11-apps/xvinfo/ChangeLog
index 3d7c0747f53e..17fe8e892684 100644
--- a/x11-apps/xvinfo/ChangeLog
+++ b/x11-apps/xvinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xvinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvinfo/ChangeLog,v 1.6 2005/11/26 09:38:16 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvinfo/ChangeLog,v 1.7 2005/12/04 22:23:12 joshuabaergen Exp $
+
+*xvinfo-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xvinfo-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   26 Nov 2005; Simon Stelling <blubb@gentoo.org> xvinfo-0.99.1.ebuild:
   added ~amd64 keyword
diff --git a/x11-apps/xvinfo/files/digest-xvinfo-0.99.2 b/x11-apps/xvinfo/files/digest-xvinfo-0.99.2
new file mode 100644
index 000000000000..da5987d6311f
--- /dev/null
+++ b/x11-apps/xvinfo/files/digest-xvinfo-0.99.2
@@ -0,0 +1 @@
+MD5 b410e30662bd765b74a61b321bded6b9 xvinfo-0.99.2.tar.bz2 73630
diff --git a/x11-apps/xvinfo/xvinfo-0.99.2.ebuild b/x11-apps/xvinfo/xvinfo-0.99.2.ebuild
new file mode 100644
index 000000000000..00143a504f0b
--- /dev/null
+++ b/x11-apps/xvinfo/xvinfo-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvinfo/xvinfo-0.99.2.ebuild,v 1.1 2005/12/04 22:23:12 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xvinfo application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXv
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xwd/ChangeLog b/x11-apps/xwd/ChangeLog
index c1a78402f5fc..06b3f14e5a2c 100644
--- a/x11-apps/xwd/ChangeLog
+++ b/x11-apps/xwd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xwd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/ChangeLog,v 1.5 2005/11/17 13:46:53 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/ChangeLog,v 1.6 2005/12/04 22:23:38 joshuabaergen Exp $
+
+*xwd-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xwd-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xwd-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xwd/files/digest-xwd-0.99.2 b/x11-apps/xwd/files/digest-xwd-0.99.2
new file mode 100644
index 000000000000..b0ac9ea0e42a
--- /dev/null
+++ b/x11-apps/xwd/files/digest-xwd-0.99.2
@@ -0,0 +1 @@
+MD5 143d2e4752cf2f3913935cc03ffea89d xwd-0.99.2.tar.bz2 95807
diff --git a/x11-apps/xwd/xwd-0.99.2.ebuild b/x11-apps/xwd/xwd-0.99.2.ebuild
new file mode 100644
index 000000000000..b570f6af97a0
--- /dev/null
+++ b/x11-apps/xwd/xwd-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/xwd-0.99.2.ebuild,v 1.1 2005/12/04 22:23:38 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xwd application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xwininfo/ChangeLog b/x11-apps/xwininfo/ChangeLog
index a61e82714d23..e75c7e1046e5 100644
--- a/x11-apps/xwininfo/ChangeLog
+++ b/x11-apps/xwininfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xwininfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/ChangeLog,v 1.5 2005/11/17 13:49:57 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/ChangeLog,v 1.6 2005/12/04 22:24:21 joshuabaergen Exp $
+
+*xwininfo-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xwininfo-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xwininfo-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xwininfo/files/digest-xwininfo-0.99.2 b/x11-apps/xwininfo/files/digest-xwininfo-0.99.2
new file mode 100644
index 000000000000..a545eec560f9
--- /dev/null
+++ b/x11-apps/xwininfo/files/digest-xwininfo-0.99.2
@@ -0,0 +1 @@
+MD5 2ef413a80aa6579c0a97cd071a4cc14a xwininfo-0.99.2.tar.bz2 86233
diff --git a/x11-apps/xwininfo/xwininfo-0.99.2.ebuild b/x11-apps/xwininfo/xwininfo-0.99.2.ebuild
new file mode 100644
index 000000000000..9524bb26fc8c
--- /dev/null
+++ b/x11-apps/xwininfo/xwininfo-0.99.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-0.99.2.ebuild,v 1.1 2005/12/04 22:24:21 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xwininfo application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xwud/ChangeLog b/x11-apps/xwud/ChangeLog
index 176485f6b3c9..ce0050c46126 100644
--- a/x11-apps/xwud/ChangeLog
+++ b/x11-apps/xwud/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xwud
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/ChangeLog,v 1.5 2005/11/17 13:49:26 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/ChangeLog,v 1.6 2005/12/04 22:24:52 joshuabaergen Exp $
+
+*xwud-0.99.2 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xwud-0.99.2.ebuild:
+  Bump for 7.0RC3.
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xwud-0.99.1.ebuild:
   Marked ~amd64.
diff --git a/x11-apps/xwud/files/digest-xwud-0.99.2 b/x11-apps/xwud/files/digest-xwud-0.99.2
new file mode 100644
index 000000000000..899bc99a329a
--- /dev/null
+++ b/x11-apps/xwud/files/digest-xwud-0.99.2
@@ -0,0 +1 @@
+MD5 8b234385a7bf9573718519142164bb93 xwud-0.99.2.tar.bz2 81939
diff --git a/x11-apps/xwud/xwud-0.99.2.ebuild b/x11-apps/xwud/xwud-0.99.2.ebuild
new file mode 100644
index 000000000000..92326a6d030e
--- /dev/null
+++ b/x11-apps/xwud/xwud-0.99.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/xwud-0.99.2.ebuild,v 1.1 2005/12/04 22:24:52 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xwud application"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"