Bump for 7.0RC2.

(Portage version: 2.0.53_rc7)

38 files changed, 341 insertions, 17 deletions

diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog
index 1368ba36cc0a..25ac39e17197 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.9 2005/10/31 21:43:12 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.10 2005/11/11 19:55:14 joshuabaergen Exp $
+
+*xfs-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xfs-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
   31 Oct 2005; <dang@gentoo.org> xfs-0.99.1.ebuild:
   Marked ~amd64
diff --git a/x11-apps/xfs/files/digest-xfs-0.99.2 b/x11-apps/xfs/files/digest-xfs-0.99.2
new file mode 100644
index 000000000000..20c6e79fdcc7
--- /dev/null
+++ b/x11-apps/xfs/files/digest-xfs-0.99.2
@@ -0,0 +1 @@
+MD5 c3a75285b1fb6ad4cd1d80ab6f7270ea xfs-0.99.2.tar.bz2 139228
diff --git a/x11-apps/xfs/xfs-0.99.2.ebuild b/x11-apps/xfs/xfs-0.99.2.ebuild
new file mode 100644
index 000000000000..f7d66cc24474
--- /dev/null
+++ b/x11-apps/xfs/xfs-0.99.2.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.2.ebuild,v 1.1 2005/11/11 19:55:14 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/xhost/ChangeLog b/x11-apps/xhost/ChangeLog
index 8a9a05f7d914..3e13701305ba 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.10 2005/10/27 15:23:07 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/ChangeLog,v 1.11 2005/11/11 19:55:41 joshuabaergen Exp $
+
+*xhost-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xhost-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *xhost-0.99.1-r1 (27 Oct 2005)
 
diff --git a/x11-apps/xhost/files/digest-xhost-0.99.2 b/x11-apps/xhost/files/digest-xhost-0.99.2
new file mode 100644
index 000000000000..4e03beba0e9e
--- /dev/null
+++ b/x11-apps/xhost/files/digest-xhost-0.99.2
@@ -0,0 +1 @@
+MD5 b539a2a71890f804fae12baf4a59bf83 xhost-0.99.2.tar.bz2 83952
diff --git a/x11-apps/xhost/xhost-0.99.2.ebuild b/x11-apps/xhost/xhost-0.99.2.ebuild
new file mode 100644
index 000000000000..cd2e4beecf25
--- /dev/null
+++ b/x11-apps/xhost/xhost-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/xhost/xhost-0.99.2.ebuild,v 1.1 2005/11/11 19:55:41 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/xkbevd/ChangeLog b/x11-apps/xkbevd/ChangeLog
index f81234d4b538..9f56d6d2401c 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.4 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/ChangeLog,v 1.5 2005/11/11 19:56:07 joshuabaergen Exp $
+
+*xkbevd-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkbevd-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *xkbevd-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xkbevd/files/digest-xkbevd-0.99.2 b/x11-apps/xkbevd/files/digest-xkbevd-0.99.2
new file mode 100644
index 000000000000..8e07c7dc965e
--- /dev/null
+++ b/x11-apps/xkbevd/files/digest-xkbevd-0.99.2
@@ -0,0 +1 @@
+MD5 c243bbe5c4ea60fc3d27da1737e5335c xkbevd-0.99.2.tar.bz2 100254
diff --git a/x11-apps/xkbevd/xkbevd-0.99.2.ebuild b/x11-apps/xkbevd/xkbevd-0.99.2.ebuild
new file mode 100644
index 000000000000..62dec63085a2
--- /dev/null
+++ b/x11-apps/xkbevd/xkbevd-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/xkbevd/xkbevd-0.99.2.ebuild,v 1.1 2005/11/11 19:56:07 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xkbevd application"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+RDEPEND="x11-libs/libxkbfile"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbutils/ChangeLog b/x11-apps/xkbutils/ChangeLog
index 29172cd9674a..a3fd1331c715 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.3 2005/09/09 07:07:27 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/ChangeLog,v 1.4 2005/11/11 19:56:53 joshuabaergen Exp $
+
+*xkbutils-0.99.1 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkbutils-0.99.1.ebuild:
+  Bump for 7.0RC2.
 
   09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
   Add metadata.
diff --git a/x11-apps/xkbutils/files/digest-xkbutils-0.99.1 b/x11-apps/xkbutils/files/digest-xkbutils-0.99.1
new file mode 100644
index 000000000000..bf1a8b4187e7
--- /dev/null
+++ b/x11-apps/xkbutils/files/digest-xkbutils-0.99.1
@@ -0,0 +1 @@
+MD5 37dc54514207cddd7ce22bb04e6a50b0 xkbutils-0.99.1.tar.bz2 64679
diff --git a/x11-apps/xkbutils/xkbutils-0.99.1.ebuild b/x11-apps/xkbutils/xkbutils-0.99.1.ebuild
new file mode 100644
index 000000000000..38ab32dc8712
--- /dev/null
+++ b/x11-apps/xkbutils/xkbutils-0.99.1.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.1.ebuild,v 1.1 2005/11/11 19:56:53 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xkbutils application"
+KEYWORDS="~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/xman/ChangeLog b/x11-apps/xman/ChangeLog
index 7783355183f1..81188456ee33 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.4 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/ChangeLog,v 1.5 2005/11/11 19:57:19 joshuabaergen Exp $
+
+*xman-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xman-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *xman-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xman/files/digest-xman-0.99.2 b/x11-apps/xman/files/digest-xman-0.99.2
new file mode 100644
index 000000000000..08645180fb9d
--- /dev/null
+++ b/x11-apps/xman/files/digest-xman-0.99.2
@@ -0,0 +1 @@
+MD5 f86a607b16f0ac72fbc906263fa5c667 xman-0.99.2.tar.bz2 131151
diff --git a/x11-apps/xman/xman-0.99.2.ebuild b/x11-apps/xman/xman-0.99.2.ebuild
new file mode 100644
index 000000000000..ae1679189566
--- /dev/null
+++ b/x11-apps/xman/xman-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/xman/xman-0.99.2.ebuild,v 1.1 2005/11/11 19:57:19 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xman 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/xmh/ChangeLog b/x11-apps/xmh/ChangeLog
index 00f2fb9cf755..d1713954c266 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.4 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmh/ChangeLog,v 1.5 2005/11/11 19:57:59 joshuabaergen Exp $
+
+*xmh-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xmh-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *xmh-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xmh/files/digest-xmh-0.99.2 b/x11-apps/xmh/files/digest-xmh-0.99.2
new file mode 100644
index 000000000000..8fcc83c95e83
--- /dev/null
+++ b/x11-apps/xmh/files/digest-xmh-0.99.2
@@ -0,0 +1 @@
+MD5 145a98d6054671716f22bcdf8ed9840d xmh-0.99.2.tar.bz2 150888
diff --git a/x11-apps/xmh/xmh-0.99.2.ebuild b/x11-apps/xmh/xmh-0.99.2.ebuild
new file mode 100644
index 000000000000..f134bb46be75
--- /dev/null
+++ b/x11-apps/xmh/xmh-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/xmh/xmh-0.99.2.ebuild,v 1.1 2005/11/11 19:57:59 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/xrx/ChangeLog b/x11-apps/xrx/ChangeLog
index bffaca5189f1..24f3abc38658 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.3 2005/10/27 15:23:37 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrx/ChangeLog,v 1.4 2005/11/11 19:58:23 joshuabaergen Exp $
+
+*xrx-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xrx-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *xrx-0.99.1-r1 (27 Oct 2005)
 
diff --git a/x11-apps/xrx/files/digest-xrx-0.99.2 b/x11-apps/xrx/files/digest-xrx-0.99.2
new file mode 100644
index 000000000000..f445ac713e5e
--- /dev/null
+++ b/x11-apps/xrx/files/digest-xrx-0.99.2
@@ -0,0 +1 @@
+MD5 9c68169dfc89af3b3d2d3fb30d5c8156 xrx-0.99.2.tar.bz2 227646
diff --git a/x11-apps/xrx/xrx-0.99.2.ebuild b/x11-apps/xrx/xrx-0.99.2.ebuild
new file mode 100644
index 000000000000..4ae4917167cd
--- /dev/null
+++ b/x11-apps/xrx/xrx-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/xrx/xrx-0.99.2.ebuild,v 1.1 2005/11/11 19:58:23 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 357639a1bc3c..7c99fa550584 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.9 2005/10/31 17:43:31 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/ChangeLog,v 1.10 2005/11/11 19:59:23 joshuabaergen Exp $
+
+*xset-0.99.3 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xset-0.99.3.ebuild:
+  Bump for 7.0RC2.
 
   31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; -xset-0.99.0.ebuild,
   -xset-0.99.1_pre20050905.ebuild:
diff --git a/x11-apps/xset/files/digest-xset-0.99.3 b/x11-apps/xset/files/digest-xset-0.99.3
new file mode 100644
index 000000000000..a77e383f4cf5
--- /dev/null
+++ b/x11-apps/xset/files/digest-xset-0.99.3
@@ -0,0 +1 @@
+MD5 1c4444f3a4cdb10758c392751f467e66 xset-0.99.3.tar.bz2 86313
diff --git a/x11-apps/xset/xset-0.99.3.ebuild b/x11-apps/xset/xset-0.99.3.ebuild
new file mode 100644
index 000000000000..07d0cd46de11
--- /dev/null
+++ b/x11-apps/xset/xset-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/xset/xset-0.99.3.ebuild,v 1.1 2005/11/11 19:59:23 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/xsetpointer/ChangeLog b/x11-apps/xsetpointer/ChangeLog
index fdba5bdab140..e748b7c8f9d1 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.4 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetpointer/ChangeLog,v 1.5 2005/11/11 19:58:53 joshuabaergen Exp $
+
+*xsetpointer-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xsetpointer-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *xsetpointer-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xsetpointer/files/digest-xsetpointer-0.99.2 b/x11-apps/xsetpointer/files/digest-xsetpointer-0.99.2
new file mode 100644
index 000000000000..ed64b047a0b7
--- /dev/null
+++ b/x11-apps/xsetpointer/files/digest-xsetpointer-0.99.2
@@ -0,0 +1 @@
+MD5 3be61d272328ff77b0af46842ad35b7c xsetpointer-0.99.2.tar.bz2 72202
diff --git a/x11-apps/xsetpointer/xsetpointer-0.99.2.ebuild b/x11-apps/xsetpointer/xsetpointer-0.99.2.ebuild
new file mode 100644
index 000000000000..695c237cecf3
--- /dev/null
+++ b/x11-apps/xsetpointer/xsetpointer-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/xsetpointer/xsetpointer-0.99.2.ebuild,v 1.1 2005/11/11 19:58: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/xsm/ChangeLog b/x11-apps/xsm/ChangeLog
index 175dec1b6aa7..f42b665309bb 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.4 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/ChangeLog,v 1.5 2005/11/11 20:00:02 joshuabaergen Exp $
+
+*xsm-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xsm-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *xsm-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xsm/files/digest-xsm-0.99.2 b/x11-apps/xsm/files/digest-xsm-0.99.2
new file mode 100644
index 000000000000..8c5c31b1392b
--- /dev/null
+++ b/x11-apps/xsm/files/digest-xsm-0.99.2
@@ -0,0 +1 @@
+MD5 07968f527f3f67576a21051174c7fb82 xsm-0.99.2.tar.bz2 114405
diff --git a/x11-apps/xsm/xsm-0.99.2.ebuild b/x11-apps/xsm/xsm-0.99.2.ebuild
new file mode 100644
index 000000000000..ecc2b08e2c0c
--- /dev/null
+++ b/x11-apps/xsm/xsm-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/xsm/xsm-0.99.2.ebuild,v 1.1 2005/11/11 20:00:02 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-misc/makedepend/ChangeLog b/x11-misc/makedepend/ChangeLog
index ee7bf8bbe240..bef202ca0d64 100644
--- a/x11-misc/makedepend/ChangeLog
+++ b/x11-misc/makedepend/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/makedepend
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/makedepend/ChangeLog,v 1.8 2005/10/20 06:19:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/makedepend/ChangeLog,v 1.9 2005/11/11 19:55:33 joshuabaergen Exp $
+
+*makedepend-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +makedepend-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *makedepend-0.99.1 (20 Oct 2005)
 
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 18ff06a1ca60..988304d3e7b0 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,6 +1,8 @@
-MD5 8e9decbe358fc3d5e57e58ed004acb56 ChangeLog 1108
-MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 12df072b5ed4da490ea81b34553b4dee makedepend-0.99.0.ebuild 454
-MD5 f408e16332753d4d95d506c75a30f1a4 makedepend-0.99.1.ebuild 461
+MD5 ba1328c84482333c3d5d3cd3f74a7774 ChangeLog 1248
 MD5 f42954314c60d8981f8cc77ddab74746 files/digest-makedepend-0.99.0 69
 MD5 53887c198ea2f5111aeeb4e02c5849fa files/digest-makedepend-0.99.1 69
+MD5 a248c9d31e1dbbf95809910299ae1b0c files/digest-makedepend-0.99.2 69
+MD5 12df072b5ed4da490ea81b34553b4dee makedepend-0.99.0.ebuild 454
+MD5 f408e16332753d4d95d506c75a30f1a4 makedepend-0.99.1.ebuild 461
+MD5 f408e16332753d4d95d506c75a30f1a4 makedepend-0.99.2.ebuild 461
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-misc/makedepend/files/digest-makedepend-0.99.2 b/x11-misc/makedepend/files/digest-makedepend-0.99.2
new file mode 100644
index 000000000000..a0d74fbb71f2
--- /dev/null
+++ b/x11-misc/makedepend/files/digest-makedepend-0.99.2
@@ -0,0 +1 @@
+MD5 2fbed35fb9e95b84f13534c6e2993c21 makedepend-0.99.2.tar.bz2 80887
diff --git a/x11-misc/makedepend/makedepend-0.99.2.ebuild b/x11-misc/makedepend/makedepend-0.99.2.ebuild
new file mode 100644
index 000000000000..f35d8dbd8c3b
--- /dev/null
+++ b/x11-misc/makedepend/makedepend-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-misc/makedepend/makedepend-0.99.2.ebuild,v 1.1 2005/11/11 19:55:33 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org makedepend utility"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-misc/xorg-cf-files/ChangeLog b/x11-misc/xorg-cf-files/ChangeLog
index 436653f9d1a5..0ce30ef1a571 100644
--- a/x11-misc/xorg-cf-files/ChangeLog
+++ b/x11-misc/xorg-cf-files/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xorg-cf-files
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog,v 1.5 2005/11/08 05:28:26 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog,v 1.6 2005/11/11 19:58:23 joshuabaergen Exp $
+
+*xorg-cf-files-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-cf-files-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *xorg-cf-files-0.99.1-r1 (08 Nov 2005)
 
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 5dfaa4fec138..4dfb390fc6da 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,4 +1,6 @@
-MD5 6107369c3aa9347e594e7280d9f11958 ChangeLog 957
+MD5 c8de7550bf2722e4de1250b4b6576c88 ChangeLog 1103
 MD5 f7b078c4198516f9cd8a64684911fbe1 files/digest-xorg-cf-files-0.99.1-r1 73
+MD5 bc5ef520bc3e15d4572835450358d92f files/digest-xorg-cf-files-0.99.2 73
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 MD5 e352be1c40f30362846cf95815cfd7b4 xorg-cf-files-0.99.1-r1.ebuild 707
+MD5 e352be1c40f30362846cf95815cfd7b4 xorg-cf-files-0.99.2.ebuild 707
diff --git a/x11-misc/xorg-cf-files/files/digest-xorg-cf-files-0.99.2 b/x11-misc/xorg-cf-files/files/digest-xorg-cf-files-0.99.2
new file mode 100644
index 000000000000..c602d88e281a
--- /dev/null
+++ b/x11-misc/xorg-cf-files/files/digest-xorg-cf-files-0.99.2
@@ -0,0 +1 @@
+MD5 7f9081ed93a97ada99fe9bda967b1c8c xorg-cf-files-0.99.2.tar.bz2 254769
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-0.99.2.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-0.99.2.ebuild
new file mode 100644
index 000000000000..948fd39e35c6
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-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-misc/xorg-cf-files/xorg-cf-files-0.99.2.ebuild,v 1.1 2005/11/11 19:58:23 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+# SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="Old Imake-related build files"
+KEYWORDS="~amd64 ~mips ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_install() {
+	x-modular_src_install
+
+	# Hack to supply missing files until it's fixed upstream
+	echo "" >> ${D}/usr/$(get_libdir)/X11/config/host.def
+	echo "" >> ${D}/usr/$(get_libdir)/X11/config/version.def
+	echo "" >> ${D}/usr/$(get_libdir)/X11/config/date.def
+}