Bump for 7.0RC4.

Package-Manager: portage-2.1_pre1

90 files changed, 679 insertions, 30 deletions

diff --git a/x11-proto/bigreqsproto/ChangeLog b/x11-proto/bigreqsproto/ChangeLog
index 99f10b7b91bf..ffad13c40681 100644
--- a/x11-proto/bigreqsproto/ChangeLog
+++ b/x11-proto/bigreqsproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/bigreqsproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/bigreqsproto/ChangeLog,v 1.8 2005/12/09 07:38:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/bigreqsproto/ChangeLog,v 1.9 2005/12/17 20:59:47 joshuabaergen Exp $
+
+*bigreqsproto-1.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +bigreqsproto-1.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -bigreqsproto-1.0.ebuild:
diff --git a/x11-proto/bigreqsproto/bigreqsproto-1.0.2.ebuild b/x11-proto/bigreqsproto/bigreqsproto-1.0.2.ebuild
new file mode 100644
index 000000000000..611a94b22081
--- /dev/null
+++ b/x11-proto/bigreqsproto/bigreqsproto-1.0.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-proto/bigreqsproto/bigreqsproto-1.0.2.ebuild,v 1.1 2005/12/17 20:59:47 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org BigReqs protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/bigreqsproto/files/digest-bigreqsproto-1.0.2 b/x11-proto/bigreqsproto/files/digest-bigreqsproto-1.0.2
new file mode 100644
index 000000000000..0867843300b5
--- /dev/null
+++ b/x11-proto/bigreqsproto/files/digest-bigreqsproto-1.0.2
@@ -0,0 +1 @@
+MD5 0af2c8aa47f5ff24f1fc2a3f5f91fb17 bigreqsproto-1.0.2.tar.bz2 36631
diff --git a/x11-proto/compositeproto/ChangeLog b/x11-proto/compositeproto/ChangeLog
index 2a67187b9969..7976ba9433b9 100644
--- a/x11-proto/compositeproto/ChangeLog
+++ b/x11-proto/compositeproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/compositeproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/compositeproto/ChangeLog,v 1.8 2005/12/09 07:38:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/compositeproto/ChangeLog,v 1.9 2005/12/17 21:00:22 joshuabaergen Exp $
+
+*compositeproto-0.2.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +compositeproto-0.2.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -compositeproto-0.2.ebuild:
diff --git a/x11-proto/compositeproto/compositeproto-0.2.2.ebuild b/x11-proto/compositeproto/compositeproto-0.2.2.ebuild
new file mode 100644
index 000000000000..c45550a4f43a
--- /dev/null
+++ b/x11-proto/compositeproto/compositeproto-0.2.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-proto/compositeproto/compositeproto-0.2.2.ebuild,v 1.1 2005/12/17 21:00:22 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Composite protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/compositeproto/files/digest-compositeproto-0.2.2 b/x11-proto/compositeproto/files/digest-compositeproto-0.2.2
new file mode 100644
index 000000000000..fb84d8dd00a6
--- /dev/null
+++ b/x11-proto/compositeproto/files/digest-compositeproto-0.2.2
@@ -0,0 +1 @@
+MD5 4e067fec41f3a5ddef35d681823b664d compositeproto-0.2.2.tar.bz2 37361
diff --git a/x11-proto/damageproto/ChangeLog b/x11-proto/damageproto/ChangeLog
index e95fa9a0fb43..0f7d1caf2fd1 100644
--- a/x11-proto/damageproto/ChangeLog
+++ b/x11-proto/damageproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/damageproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/damageproto/ChangeLog,v 1.8 2005/12/09 07:39:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/damageproto/ChangeLog,v 1.9 2005/12/17 21:01:02 joshuabaergen Exp $
+
+*damageproto-1.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +damageproto-1.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -damageproto-1.0.ebuild:
diff --git a/x11-proto/damageproto/damageproto-1.0.2.ebuild b/x11-proto/damageproto/damageproto-1.0.2.ebuild
new file mode 100644
index 000000000000..88ca3f060513
--- /dev/null
+++ b/x11-proto/damageproto/damageproto-1.0.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-proto/damageproto/damageproto-1.0.2.ebuild,v 1.1 2005/12/17 21:01:02 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Damage protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/damageproto/files/digest-damageproto-1.0.2 b/x11-proto/damageproto/files/digest-damageproto-1.0.2
new file mode 100644
index 000000000000..135e4d108679
--- /dev/null
+++ b/x11-proto/damageproto/files/digest-damageproto-1.0.2
@@ -0,0 +1 @@
+MD5 9b0b8b18259d67ec868336ca5bfd5228 damageproto-1.0.2.tar.bz2 37443
diff --git a/x11-proto/dmxproto/ChangeLog b/x11-proto/dmxproto/ChangeLog
index 146aa42a49da..db1fb720b96e 100644
--- a/x11-proto/dmxproto/ChangeLog
+++ b/x11-proto/dmxproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/dmxproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/dmxproto/ChangeLog,v 1.8 2005/12/09 07:39:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/dmxproto/ChangeLog,v 1.9 2005/12/17 21:01:36 joshuabaergen Exp $
+
+*dmxproto-2.2.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +dmxproto-2.2.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -dmxproto-2.2.ebuild:
   Pull old versions.
diff --git a/x11-proto/dmxproto/dmxproto-2.2.2.ebuild b/x11-proto/dmxproto/dmxproto-2.2.2.ebuild
new file mode 100644
index 000000000000..9eab53dfb05b
--- /dev/null
+++ b/x11-proto/dmxproto/dmxproto-2.2.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-proto/dmxproto/dmxproto-2.2.2.ebuild,v 1.1 2005/12/17 21:01:36 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org DMX protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/dmxproto/files/digest-dmxproto-2.2.2 b/x11-proto/dmxproto/files/digest-dmxproto-2.2.2
new file mode 100644
index 000000000000..4fce0a237e61
--- /dev/null
+++ b/x11-proto/dmxproto/files/digest-dmxproto-2.2.2
@@ -0,0 +1 @@
+MD5 87b97f99016c7c0d7b5bfff02cb5dbc8 dmxproto-2.2.2.tar.bz2 39322
diff --git a/x11-proto/evieext/ChangeLog b/x11-proto/evieext/ChangeLog
index 118ad6029875..364292513c0b 100644
--- a/x11-proto/evieext/ChangeLog
+++ b/x11-proto/evieext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/evieext
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/evieext/ChangeLog,v 1.8 2005/12/09 07:40:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/evieext/ChangeLog,v 1.9 2005/12/17 21:02:11 joshuabaergen Exp $
+
+*evieext-1.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +evieext-1.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -evieext-1.0.ebuild:
   Pull old versions.
diff --git a/x11-proto/evieext/evieext-1.0.2.ebuild b/x11-proto/evieext/evieext-1.0.2.ebuild
new file mode 100644
index 000000000000..b5abc684389b
--- /dev/null
+++ b/x11-proto/evieext/evieext-1.0.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-proto/evieext/evieext-1.0.2.ebuild,v 1.1 2005/12/17 21:02:11 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org EvIE protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/evieext/files/digest-evieext-1.0.2 b/x11-proto/evieext/files/digest-evieext-1.0.2
new file mode 100644
index 000000000000..05c04c9913ad
--- /dev/null
+++ b/x11-proto/evieext/files/digest-evieext-1.0.2
@@ -0,0 +1 @@
+MD5 f4f22934941de43926bd39089461a680 evieext-1.0.2.tar.bz2 37489
diff --git a/x11-proto/fixesproto/ChangeLog b/x11-proto/fixesproto/ChangeLog
index 933f28b7b905..894c06000279 100644
--- a/x11-proto/fixesproto/ChangeLog
+++ b/x11-proto/fixesproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/fixesproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/fixesproto/ChangeLog,v 1.8 2005/12/09 07:40:28 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/fixesproto/ChangeLog,v 1.9 2005/12/17 21:02:46 joshuabaergen Exp $
+
+*fixesproto-3.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +fixesproto-3.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -fixesproto-3.0.ebuild:
diff --git a/x11-proto/fixesproto/files/digest-fixesproto-3.0.2 b/x11-proto/fixesproto/files/digest-fixesproto-3.0.2
new file mode 100644
index 000000000000..eb149d0cc27f
--- /dev/null
+++ b/x11-proto/fixesproto/files/digest-fixesproto-3.0.2
@@ -0,0 +1 @@
+MD5 f748f5b72294741ce1f1ca322f3e6ec1 fixesproto-3.0.2.tar.bz2 38760
diff --git a/x11-proto/fixesproto/fixesproto-3.0.2.ebuild b/x11-proto/fixesproto/fixesproto-3.0.2.ebuild
new file mode 100644
index 000000000000..c1e3d5afcd05
--- /dev/null
+++ b/x11-proto/fixesproto/fixesproto-3.0.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-proto/fixesproto/fixesproto-3.0.2.ebuild,v 1.1 2005/12/17 21:02:46 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Fixes protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/fontcacheproto/ChangeLog b/x11-proto/fontcacheproto/ChangeLog
index 4d6aaaaeef4e..0c9a0d3849bb 100644
--- a/x11-proto/fontcacheproto/ChangeLog
+++ b/x11-proto/fontcacheproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/fontcacheproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/fontcacheproto/ChangeLog,v 1.8 2005/12/09 07:40:53 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/fontcacheproto/ChangeLog,v 1.9 2005/12/17 21:03:17 joshuabaergen Exp $
+
+*fontcacheproto-0.1.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +fontcacheproto-0.1.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -fontcacheproto-0.1.ebuild:
diff --git a/x11-proto/fontcacheproto/files/digest-fontcacheproto-0.1.2 b/x11-proto/fontcacheproto/files/digest-fontcacheproto-0.1.2
new file mode 100644
index 000000000000..53aaf310f69a
--- /dev/null
+++ b/x11-proto/fontcacheproto/files/digest-fontcacheproto-0.1.2
@@ -0,0 +1 @@
+MD5 9482258239fa5627045e82039e4879ed fontcacheproto-0.1.2.tar.bz2 38197
diff --git a/x11-proto/fontcacheproto/fontcacheproto-0.1.2.ebuild b/x11-proto/fontcacheproto/fontcacheproto-0.1.2.ebuild
new file mode 100644
index 000000000000..360c48510ccc
--- /dev/null
+++ b/x11-proto/fontcacheproto/fontcacheproto-0.1.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-proto/fontcacheproto/fontcacheproto-0.1.2.ebuild,v 1.1 2005/12/17 21:03:17 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Fontcache protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/fontsproto/ChangeLog b/x11-proto/fontsproto/ChangeLog
index 496c9eae2c43..1d7c51877882 100644
--- a/x11-proto/fontsproto/ChangeLog
+++ b/x11-proto/fontsproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/fontsproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/fontsproto/ChangeLog,v 1.8 2005/12/09 07:41:18 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/fontsproto/ChangeLog,v 1.9 2005/12/17 21:03:52 joshuabaergen Exp $
+
+*fontsproto-2.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +fontsproto-2.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -fontsproto-2.0.ebuild:
diff --git a/x11-proto/fontsproto/files/digest-fontsproto-2.0.2 b/x11-proto/fontsproto/files/digest-fontsproto-2.0.2
new file mode 100644
index 000000000000..b1dd09dad006
--- /dev/null
+++ b/x11-proto/fontsproto/files/digest-fontsproto-2.0.2
@@ -0,0 +1 @@
+MD5 aaf71f68f8f8cb418801e404c72243fa fontsproto-2.0.2.tar.bz2 45255
diff --git a/x11-proto/fontsproto/fontsproto-2.0.2.ebuild b/x11-proto/fontsproto/fontsproto-2.0.2.ebuild
new file mode 100644
index 000000000000..6228baae11c8
--- /dev/null
+++ b/x11-proto/fontsproto/fontsproto-2.0.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-proto/fontsproto/fontsproto-2.0.2.ebuild,v 1.1 2005/12/17 21:03:52 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Fonts protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/glproto/ChangeLog b/x11-proto/glproto/ChangeLog
index c21d6627fb83..44a5ebd86e85 100644
--- a/x11-proto/glproto/ChangeLog
+++ b/x11-proto/glproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/glproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/ChangeLog,v 1.17 2005/10/31 17:38:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/ChangeLog,v 1.18 2005/12/17 21:04:32 joshuabaergen Exp $
+
+*glproto-1.4.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +glproto-1.4.2.ebuild:
+  Bump for 7.0RC4.
 
   31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -glproto-1.4-r1.ebuild, -glproto-1.4.1_pre20051013.ebuild:
diff --git a/x11-proto/glproto/files/digest-glproto-1.4.2 b/x11-proto/glproto/files/digest-glproto-1.4.2
new file mode 100644
index 000000000000..58e74ee8e0d5
--- /dev/null
+++ b/x11-proto/glproto/files/digest-glproto-1.4.2
@@ -0,0 +1 @@
+MD5 784790c21e5566c6c2fb58ba95937271 glproto-1.4.2.tar.bz2 53556
diff --git a/x11-proto/glproto/glproto-1.4.2.ebuild b/x11-proto/glproto/glproto-1.4.2.ebuild
new file mode 100644
index 000000000000..532d2eb9787b
--- /dev/null
+++ b/x11-proto/glproto/glproto-1.4.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.2.ebuild,v 1.1 2005/12/17 21:04:32 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="X.Org GL protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-admin/eselect-opengl"
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+		local x=""
+		# glext.h added for #54984
+		for x in ${D}/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+			fi
+		done
+	eend 0
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+}
diff --git a/x11-proto/inputproto/ChangeLog b/x11-proto/inputproto/ChangeLog
index 0586a65fd103..5341ead0275e 100644
--- a/x11-proto/inputproto/ChangeLog
+++ b/x11-proto/inputproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/inputproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/ChangeLog,v 1.8 2005/12/09 07:41:45 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/ChangeLog,v 1.9 2005/12/17 21:05:03 joshuabaergen Exp $
+
+*inputproto-1.3.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +inputproto-1.3.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -inputproto-1.3.ebuild:
diff --git a/x11-proto/inputproto/files/digest-inputproto-1.3.2 b/x11-proto/inputproto/files/digest-inputproto-1.3.2
new file mode 100644
index 000000000000..c6245eaf7884
--- /dev/null
+++ b/x11-proto/inputproto/files/digest-inputproto-1.3.2
@@ -0,0 +1 @@
+MD5 6f02bfa0ea33e2a3473679208acb192c inputproto-1.3.2.tar.bz2 46368
diff --git a/x11-proto/inputproto/inputproto-1.3.2.ebuild b/x11-proto/inputproto/inputproto-1.3.2.ebuild
new file mode 100644
index 000000000000..a6dcadc34965
--- /dev/null
+++ b/x11-proto/inputproto/inputproto-1.3.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-proto/inputproto/inputproto-1.3.2.ebuild,v 1.1 2005/12/17 21:05:03 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Input protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/kbproto/ChangeLog b/x11-proto/kbproto/ChangeLog
index b43df2cdccc5..6e3455589748 100644
--- a/x11-proto/kbproto/ChangeLog
+++ b/x11-proto/kbproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/kbproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/kbproto/ChangeLog,v 1.10 2005/12/09 15:32:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/kbproto/ChangeLog,v 1.11 2005/12/17 21:05:47 joshuabaergen Exp $
+
+*kbproto-1.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +kbproto-1.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -files/add-xkbbindirectory.patch:
diff --git a/x11-proto/kbproto/files/digest-kbproto-1.0.2 b/x11-proto/kbproto/files/digest-kbproto-1.0.2
new file mode 100644
index 000000000000..19dded17b33c
--- /dev/null
+++ b/x11-proto/kbproto/files/digest-kbproto-1.0.2
@@ -0,0 +1 @@
+MD5 a7ad6233c3926af7c288c00370a7e2b9 kbproto-1.0.2.tar.bz2 57843
diff --git a/x11-proto/kbproto/kbproto-1.0.2.ebuild b/x11-proto/kbproto/kbproto-1.0.2.ebuild
new file mode 100644
index 000000000000..0d6f090ff42c
--- /dev/null
+++ b/x11-proto/kbproto/kbproto-1.0.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-proto/kbproto/kbproto-1.0.2.ebuild,v 1.1 2005/12/17 21:05:47 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org KB protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/printproto/ChangeLog b/x11-proto/printproto/ChangeLog
index c882ccd02e7c..16c3eea55cce 100644
--- a/x11-proto/printproto/ChangeLog
+++ b/x11-proto/printproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/printproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/printproto/ChangeLog,v 1.9 2005/12/09 07:42:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/printproto/ChangeLog,v 1.10 2005/12/17 21:06:27 joshuabaergen Exp $
+
+*printproto-1.0.3 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +printproto-1.0.3.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -printproto-1.0.ebuild, -printproto-1.0.1.ebuild:
diff --git a/x11-proto/printproto/files/digest-printproto-1.0.3 b/x11-proto/printproto/files/digest-printproto-1.0.3
new file mode 100644
index 000000000000..4896db70d9bd
--- /dev/null
+++ b/x11-proto/printproto/files/digest-printproto-1.0.3
@@ -0,0 +1 @@
+MD5 c685f456391bd21d3089b736d17d7132 printproto-1.0.3.tar.bz2 43442
diff --git a/x11-proto/printproto/printproto-1.0.3.ebuild b/x11-proto/printproto/printproto-1.0.3.ebuild
new file mode 100644
index 000000000000..af3cc7a8f3af
--- /dev/null
+++ b/x11-proto/printproto/printproto-1.0.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-proto/printproto/printproto-1.0.3.ebuild,v 1.1 2005/12/17 21:06:27 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Print protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/randrproto/ChangeLog b/x11-proto/randrproto/ChangeLog
index 457ddb909df1..4cd6e0cd9eea 100644
--- a/x11-proto/randrproto/ChangeLog
+++ b/x11-proto/randrproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/randrproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/randrproto/ChangeLog,v 1.8 2005/12/09 07:43:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/randrproto/ChangeLog,v 1.9 2005/12/17 21:07:02 joshuabaergen Exp $
+
+*randrproto-1.1.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +randrproto-1.1.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -randrproto-1.1.ebuild:
diff --git a/x11-proto/randrproto/files/digest-randrproto-1.1.2 b/x11-proto/randrproto/files/digest-randrproto-1.1.2
new file mode 100644
index 000000000000..340d8a4ece1e
--- /dev/null
+++ b/x11-proto/randrproto/files/digest-randrproto-1.1.2
@@ -0,0 +1 @@
+MD5 ef7ee482a9816f7e9614efa6e13b1cb0 randrproto-1.1.2.tar.bz2 38339
diff --git a/x11-proto/randrproto/randrproto-1.1.2.ebuild b/x11-proto/randrproto/randrproto-1.1.2.ebuild
new file mode 100644
index 000000000000..935bb31931b7
--- /dev/null
+++ b/x11-proto/randrproto/randrproto-1.1.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-proto/randrproto/randrproto-1.1.2.ebuild,v 1.1 2005/12/17 21:07:02 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Randr protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/recordproto/ChangeLog b/x11-proto/recordproto/ChangeLog
index e80ad5f87bf8..1eca82bd284c 100644
--- a/x11-proto/recordproto/ChangeLog
+++ b/x11-proto/recordproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/recordproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/recordproto/ChangeLog,v 1.8 2005/12/09 07:43:28 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/recordproto/ChangeLog,v 1.9 2005/12/17 21:07:44 joshuabaergen Exp $
+
+*recordproto-1.13.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +recordproto-1.13.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -recordproto-1.13.ebuild:
diff --git a/x11-proto/recordproto/files/digest-recordproto-1.13.2 b/x11-proto/recordproto/files/digest-recordproto-1.13.2
new file mode 100644
index 000000000000..b2b6f82a7ba0
--- /dev/null
+++ b/x11-proto/recordproto/files/digest-recordproto-1.13.2
@@ -0,0 +1 @@
+MD5 67574f83e827a4b5680478a802f6555e recordproto-1.13.2.tar.bz2 39311
diff --git a/x11-proto/recordproto/recordproto-1.13.2.ebuild b/x11-proto/recordproto/recordproto-1.13.2.ebuild
new file mode 100644
index 000000000000..87110d23409e
--- /dev/null
+++ b/x11-proto/recordproto/recordproto-1.13.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-proto/recordproto/recordproto-1.13.2.ebuild,v 1.1 2005/12/17 21:07:44 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Record protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/renderproto/ChangeLog b/x11-proto/renderproto/ChangeLog
index 28200961820f..8f4e3fabc80f 100644
--- a/x11-proto/renderproto/ChangeLog
+++ b/x11-proto/renderproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/renderproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/renderproto/ChangeLog,v 1.8 2005/12/09 07:43:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/renderproto/ChangeLog,v 1.9 2005/12/17 21:08:22 joshuabaergen Exp $
+
+*renderproto-0.9.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +renderproto-0.9.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -renderproto-0.9.ebuild:
diff --git a/x11-proto/renderproto/files/digest-renderproto-0.9.2 b/x11-proto/renderproto/files/digest-renderproto-0.9.2
new file mode 100644
index 000000000000..0871b93fa8d8
--- /dev/null
+++ b/x11-proto/renderproto/files/digest-renderproto-0.9.2
@@ -0,0 +1 @@
+MD5 4ea888582394a0c9862b2219c605797f renderproto-0.9.2.tar.bz2 40008
diff --git a/x11-proto/renderproto/renderproto-0.9.2.ebuild b/x11-proto/renderproto/renderproto-0.9.2.ebuild
new file mode 100644
index 000000000000..870eace03d6f
--- /dev/null
+++ b/x11-proto/renderproto/renderproto-0.9.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-proto/renderproto/renderproto-0.9.2.ebuild,v 1.1 2005/12/17 21:08:22 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Render protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/resourceproto/ChangeLog b/x11-proto/resourceproto/ChangeLog
index 7871ab9cac70..099e1f2451db 100644
--- a/x11-proto/resourceproto/ChangeLog
+++ b/x11-proto/resourceproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/resourceproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/resourceproto/ChangeLog,v 1.8 2005/12/09 07:44:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/resourceproto/ChangeLog,v 1.9 2005/12/17 21:08:59 joshuabaergen Exp $
+
+*resourceproto-1.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +resourceproto-1.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -resourceproto-1.0.ebuild:
diff --git a/x11-proto/resourceproto/files/digest-resourceproto-1.0.2 b/x11-proto/resourceproto/files/digest-resourceproto-1.0.2
new file mode 100644
index 000000000000..6359ace59530
--- /dev/null
+++ b/x11-proto/resourceproto/files/digest-resourceproto-1.0.2
@@ -0,0 +1 @@
+MD5 8c58b7c060e86da3e09fd2fdaf5244e3 resourceproto-1.0.2.tar.bz2 36827
diff --git a/x11-proto/resourceproto/resourceproto-1.0.2.ebuild b/x11-proto/resourceproto/resourceproto-1.0.2.ebuild
new file mode 100644
index 000000000000..75730b2763c0
--- /dev/null
+++ b/x11-proto/resourceproto/resourceproto-1.0.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-proto/resourceproto/resourceproto-1.0.2.ebuild,v 1.1 2005/12/17 21:08:59 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Resource protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/scrnsaverproto/ChangeLog b/x11-proto/scrnsaverproto/ChangeLog
index f79fa744e0b8..a7edb3cbf07f 100644
--- a/x11-proto/scrnsaverproto/ChangeLog
+++ b/x11-proto/scrnsaverproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/scrnsaverproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/scrnsaverproto/ChangeLog,v 1.8 2005/12/09 07:44:44 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/scrnsaverproto/ChangeLog,v 1.9 2005/12/17 21:09:36 joshuabaergen Exp $
+
+*scrnsaverproto-1.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +scrnsaverproto-1.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -scrnsaverproto-1.0.ebuild:
diff --git a/x11-proto/scrnsaverproto/files/digest-scrnsaverproto-1.0.2 b/x11-proto/scrnsaverproto/files/digest-scrnsaverproto-1.0.2
new file mode 100644
index 000000000000..51c25b2e85fc
--- /dev/null
+++ b/x11-proto/scrnsaverproto/files/digest-scrnsaverproto-1.0.2
@@ -0,0 +1 @@
+MD5 f5687667b79e8eade58c8d51a889f0b7 scrnsaverproto-1.0.2.tar.bz2 38458
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.0.2.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.0.2.ebuild
new file mode 100644
index 000000000000..27f58b2c4a75
--- /dev/null
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-1.0.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-proto/scrnsaverproto/scrnsaverproto-1.0.2.ebuild,v 1.1 2005/12/17 21:09:36 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org ScrnSaver protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/trapproto/ChangeLog b/x11-proto/trapproto/ChangeLog
index acd20036b8c3..e2acd81ac343 100644
--- a/x11-proto/trapproto/ChangeLog
+++ b/x11-proto/trapproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/trapproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/trapproto/ChangeLog,v 1.9 2005/12/09 07:45:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/trapproto/ChangeLog,v 1.10 2005/12/17 21:10:11 joshuabaergen Exp $
+
+*trapproto-3.4.3 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +trapproto-3.4.3.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -trapproto-3.4.ebuild, -trapproto-3.4.1.ebuild:
diff --git a/x11-proto/trapproto/files/digest-trapproto-3.4.3 b/x11-proto/trapproto/files/digest-trapproto-3.4.3
new file mode 100644
index 000000000000..dfca3cca8438
--- /dev/null
+++ b/x11-proto/trapproto/files/digest-trapproto-3.4.3
@@ -0,0 +1 @@
+MD5 dc33d19c787b05761742cded7d7d221f trapproto-3.4.3.tar.bz2 48749
diff --git a/x11-proto/trapproto/trapproto-3.4.3.ebuild b/x11-proto/trapproto/trapproto-3.4.3.ebuild
new file mode 100644
index 000000000000..c9e7e96078d5
--- /dev/null
+++ b/x11-proto/trapproto/trapproto-3.4.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-proto/trapproto/trapproto-3.4.3.ebuild,v 1.1 2005/12/17 21:10:11 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Trap protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/videoproto/ChangeLog b/x11-proto/videoproto/ChangeLog
index d5c18f026711..53f28f72e2cd 100644
--- a/x11-proto/videoproto/ChangeLog
+++ b/x11-proto/videoproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/videoproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/videoproto/ChangeLog,v 1.8 2005/12/09 07:45:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/videoproto/ChangeLog,v 1.9 2005/12/17 21:10:43 joshuabaergen Exp $
+
+*videoproto-2.2.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +videoproto-2.2.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -videoproto-2.2.ebuild:
diff --git a/x11-proto/videoproto/files/digest-videoproto-2.2.2 b/x11-proto/videoproto/files/digest-videoproto-2.2.2
new file mode 100644
index 000000000000..ca3a851b8002
--- /dev/null
+++ b/x11-proto/videoproto/files/digest-videoproto-2.2.2
@@ -0,0 +1 @@
+MD5 cf556cafa08a2b219af0245af5dec3fe videoproto-2.2.2.tar.bz2 42739
diff --git a/x11-proto/videoproto/videoproto-2.2.2.ebuild b/x11-proto/videoproto/videoproto-2.2.2.ebuild
new file mode 100644
index 000000000000..e59460153fb4
--- /dev/null
+++ b/x11-proto/videoproto/videoproto-2.2.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-proto/videoproto/videoproto-2.2.2.ebuild,v 1.1 2005/12/17 21:10:43 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Video protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xcmiscproto/ChangeLog b/x11-proto/xcmiscproto/ChangeLog
index 58cceab39747..ab68e10470d7 100644
--- a/x11-proto/xcmiscproto/ChangeLog
+++ b/x11-proto/xcmiscproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xcmiscproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcmiscproto/ChangeLog,v 1.8 2005/12/09 07:45:59 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcmiscproto/ChangeLog,v 1.9 2005/12/17 21:11:30 joshuabaergen Exp $
+
+*xcmiscproto-1.1.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xcmiscproto-1.1.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xcmiscproto-1.1.ebuild:
diff --git a/x11-proto/xcmiscproto/files/digest-xcmiscproto-1.1.2 b/x11-proto/xcmiscproto/files/digest-xcmiscproto-1.1.2
new file mode 100644
index 000000000000..cd11ac018a77
--- /dev/null
+++ b/x11-proto/xcmiscproto/files/digest-xcmiscproto-1.1.2
@@ -0,0 +1 @@
+MD5 beb1161680e6247265ae246c7861930e xcmiscproto-1.1.2.tar.bz2 36773
diff --git a/x11-proto/xcmiscproto/xcmiscproto-1.1.2.ebuild b/x11-proto/xcmiscproto/xcmiscproto-1.1.2.ebuild
new file mode 100644
index 000000000000..aa4e1d9242dc
--- /dev/null
+++ b/x11-proto/xcmiscproto/xcmiscproto-1.1.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-proto/xcmiscproto/xcmiscproto-1.1.2.ebuild,v 1.1 2005/12/17 21:11:30 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XCMisc protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xextproto/ChangeLog b/x11-proto/xextproto/ChangeLog
index 61f5a4f15af2..b966f7cf093f 100644
--- a/x11-proto/xextproto/ChangeLog
+++ b/x11-proto/xextproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xextproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xextproto/ChangeLog,v 1.8 2005/12/09 07:46:28 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xextproto/ChangeLog,v 1.9 2005/12/17 21:12:01 joshuabaergen Exp $
+
+*xextproto-7.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xextproto-7.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xextproto-7.0.ebuild:
diff --git a/x11-proto/xextproto/files/digest-xextproto-7.0.2 b/x11-proto/xextproto/files/digest-xextproto-7.0.2
new file mode 100644
index 000000000000..59c8aab19ecb
--- /dev/null
+++ b/x11-proto/xextproto/files/digest-xextproto-7.0.2
@@ -0,0 +1 @@
+MD5 b4c10b43fb3a33ee38bc606344f07b2e xextproto-7.0.2.tar.bz2 68342
diff --git a/x11-proto/xextproto/xextproto-7.0.2.ebuild b/x11-proto/xextproto/xextproto-7.0.2.ebuild
new file mode 100644
index 000000000000..b9b726f81666
--- /dev/null
+++ b/x11-proto/xextproto/xextproto-7.0.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-proto/xextproto/xextproto-7.0.2.ebuild,v 1.1 2005/12/17 21:12:01 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XExt protocol headers"
+#HOMEPAGE="http://foo.bar.com/"
+#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
+#LICENSE=""
+#SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+#IUSE="X gnome"
+#DEPEND=""
+#RDEPEND=""
diff --git a/x11-proto/xf86bigfontproto/ChangeLog b/x11-proto/xf86bigfontproto/ChangeLog
index 86eb8c84a073..6f6f98be3a85 100644
--- a/x11-proto/xf86bigfontproto/ChangeLog
+++ b/x11-proto/xf86bigfontproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xf86bigfontproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86bigfontproto/ChangeLog,v 1.8 2005/12/09 07:46:53 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86bigfontproto/ChangeLog,v 1.9 2005/12/17 21:12:32 joshuabaergen Exp $
+
+*xf86bigfontproto-1.1.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86bigfontproto-1.1.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xf86bigfontproto-1.1.ebuild:
diff --git a/x11-proto/xf86bigfontproto/files/digest-xf86bigfontproto-1.1.2 b/x11-proto/xf86bigfontproto/files/digest-xf86bigfontproto-1.1.2
new file mode 100644
index 000000000000..3d88058f086c
--- /dev/null
+++ b/x11-proto/xf86bigfontproto/files/digest-xf86bigfontproto-1.1.2
@@ -0,0 +1 @@
+MD5 53fc47c5aa3937408cfce10837714e2f xf86bigfontproto-1.1.2.tar.bz2 37338
diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.1.2.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.1.2.ebuild
new file mode 100644
index 000000000000..b04b03932074
--- /dev/null
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.1.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-proto/xf86bigfontproto/xf86bigfontproto-1.1.2.ebuild,v 1.1 2005/12/17 21:12:32 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XF86BigFont protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
diff --git a/x11-proto/xf86dgaproto/ChangeLog b/x11-proto/xf86dgaproto/ChangeLog
index 740092d62b2f..347d9248b3fd 100644
--- a/x11-proto/xf86dgaproto/ChangeLog
+++ b/x11-proto/xf86dgaproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xf86dgaproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86dgaproto/ChangeLog,v 1.8 2005/12/09 07:47:18 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86dgaproto/ChangeLog,v 1.9 2005/12/17 21:13:09 joshuabaergen Exp $
+
+*xf86dgaproto-2.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86dgaproto-2.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xf86dgaproto-2.0.ebuild:
diff --git a/x11-proto/xf86dgaproto/files/digest-xf86dgaproto-2.0.2 b/x11-proto/xf86dgaproto/files/digest-xf86dgaproto-2.0.2
new file mode 100644
index 000000000000..8c5034d1522b
--- /dev/null
+++ b/x11-proto/xf86dgaproto/files/digest-xf86dgaproto-2.0.2
@@ -0,0 +1 @@
+MD5 5046ad055d42a4e1eed6446fa630cf35 xf86dgaproto-2.0.2.tar.bz2 40092
diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-2.0.2.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-2.0.2.ebuild
new file mode 100644
index 000000000000..b7814cd9e875
--- /dev/null
+++ b/x11-proto/xf86dgaproto/xf86dgaproto-2.0.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-proto/xf86dgaproto/xf86dgaproto-2.0.2.ebuild,v 1.1 2005/12/17 21:13:09 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XF86DGA protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86driproto/ChangeLog b/x11-proto/xf86driproto/ChangeLog
index 4d1f6ef619b7..bf1a0e53fcd2 100644
--- a/x11-proto/xf86driproto/ChangeLog
+++ b/x11-proto/xf86driproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xf86driproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86driproto/ChangeLog,v 1.7 2005/12/09 07:47:44 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86driproto/ChangeLog,v 1.8 2005/12/17 21:13:48 joshuabaergen Exp $
+
+*xf86driproto-2.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86driproto-2.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xf86driproto-2.0.ebuild:
diff --git a/x11-proto/xf86driproto/files/digest-xf86driproto-2.0.2 b/x11-proto/xf86driproto/files/digest-xf86driproto-2.0.2
new file mode 100644
index 000000000000..0b3cfa180734
--- /dev/null
+++ b/x11-proto/xf86driproto/files/digest-xf86driproto-2.0.2
@@ -0,0 +1 @@
+MD5 5c1c51f0603f65d5476e3245dd188b2f xf86driproto-2.0.2.tar.bz2 42600
diff --git a/x11-proto/xf86driproto/xf86driproto-2.0.2.ebuild b/x11-proto/xf86driproto/xf86driproto-2.0.2.ebuild
new file mode 100644
index 000000000000..4bdf6b043f7b
--- /dev/null
+++ b/x11-proto/xf86driproto/xf86driproto-2.0.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-proto/xf86driproto/xf86driproto-2.0.2.ebuild,v 1.1 2005/12/17 21:13:48 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XF86DRI protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86miscproto/ChangeLog b/x11-proto/xf86miscproto/ChangeLog
index 22c85f53c32b..80210f88a61d 100644
--- a/x11-proto/xf86miscproto/ChangeLog
+++ b/x11-proto/xf86miscproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xf86miscproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86miscproto/ChangeLog,v 1.8 2005/12/09 07:48:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86miscproto/ChangeLog,v 1.9 2005/12/17 21:14:19 joshuabaergen Exp $
+
+*xf86miscproto-0.9.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86miscproto-0.9.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xf86miscproto-0.9.ebuild:
diff --git a/x11-proto/xf86miscproto/files/digest-xf86miscproto-0.9.2 b/x11-proto/xf86miscproto/files/digest-xf86miscproto-0.9.2
new file mode 100644
index 000000000000..862fb7b2a797
--- /dev/null
+++ b/x11-proto/xf86miscproto/files/digest-xf86miscproto-0.9.2
@@ -0,0 +1 @@
+MD5 f0f59524ce1e012d2a64bb6784c9bf8a xf86miscproto-0.9.2.tar.bz2 38429
diff --git a/x11-proto/xf86miscproto/xf86miscproto-0.9.2.ebuild b/x11-proto/xf86miscproto/xf86miscproto-0.9.2.ebuild
new file mode 100644
index 000000000000..4fdecd27ea40
--- /dev/null
+++ b/x11-proto/xf86miscproto/xf86miscproto-0.9.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-proto/xf86miscproto/xf86miscproto-0.9.2.ebuild,v 1.1 2005/12/17 21:14:19 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XF86Misc protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
diff --git a/x11-proto/xf86rushproto/ChangeLog b/x11-proto/xf86rushproto/ChangeLog
index 0c899d4c8d24..5debea424b0f 100644
--- a/x11-proto/xf86rushproto/ChangeLog
+++ b/x11-proto/xf86rushproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xf86rushproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86rushproto/ChangeLog,v 1.8 2005/12/09 07:48:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86rushproto/ChangeLog,v 1.9 2005/12/17 21:14:55 joshuabaergen Exp $
+
+*xf86rushproto-1.1.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86rushproto-1.1.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xf86rushproto-1.1.ebuild:
diff --git a/x11-proto/xf86rushproto/files/digest-xf86rushproto-1.1.2 b/x11-proto/xf86rushproto/files/digest-xf86rushproto-1.1.2
new file mode 100644
index 000000000000..2cea3a83e7a0
--- /dev/null
+++ b/x11-proto/xf86rushproto/files/digest-xf86rushproto-1.1.2
@@ -0,0 +1 @@
+MD5 773b6de09c0f7aa1c2c48fb3b612d993 xf86rushproto-1.1.2.tar.bz2 37664
diff --git a/x11-proto/xf86rushproto/xf86rushproto-1.1.2.ebuild b/x11-proto/xf86rushproto/xf86rushproto-1.1.2.ebuild
new file mode 100644
index 000000000000..50ab88013cd5
--- /dev/null
+++ b/x11-proto/xf86rushproto/xf86rushproto-1.1.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-proto/xf86rushproto/xf86rushproto-1.1.2.ebuild,v 1.1 2005/12/17 21:14:55 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XF86Rush protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86vidmodeproto/ChangeLog b/x11-proto/xf86vidmodeproto/ChangeLog
index 1657a5aaf440..e12f12f609cd 100644
--- a/x11-proto/xf86vidmodeproto/ChangeLog
+++ b/x11-proto/xf86vidmodeproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xf86vidmodeproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86vidmodeproto/ChangeLog,v 1.8 2005/12/09 07:48:59 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86vidmodeproto/ChangeLog,v 1.9 2005/12/17 21:15:25 joshuabaergen Exp $
+
+*xf86vidmodeproto-2.2.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86vidmodeproto-2.2.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xf86vidmodeproto-2.2.ebuild:
diff --git a/x11-proto/xf86vidmodeproto/files/digest-xf86vidmodeproto-2.2.2 b/x11-proto/xf86vidmodeproto/files/digest-xf86vidmodeproto-2.2.2
new file mode 100644
index 000000000000..3e1dedcb89f0
--- /dev/null
+++ b/x11-proto/xf86vidmodeproto/files/digest-xf86vidmodeproto-2.2.2
@@ -0,0 +1 @@
+MD5 f18d93c1d35ec3a4b93290f54c92cca7 xf86vidmodeproto-2.2.2.tar.bz2 39499
diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.2.2.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.2.2.ebuild
new file mode 100644
index 000000000000..c611a6219dd8
--- /dev/null
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.2.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-proto/xf86vidmodeproto/xf86vidmodeproto-2.2.2.ebuild,v 1.1 2005/12/17 21:15:25 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XF86VidMode protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
diff --git a/x11-proto/xineramaproto/ChangeLog b/x11-proto/xineramaproto/ChangeLog
index 112449c63f05..7d47c31130ef 100644
--- a/x11-proto/xineramaproto/ChangeLog
+++ b/x11-proto/xineramaproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xineramaproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xineramaproto/ChangeLog,v 1.10 2005/12/09 07:49:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xineramaproto/ChangeLog,v 1.11 2005/12/17 21:15:55 joshuabaergen Exp $
+
+*xineramaproto-1.1.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xineramaproto-1.1.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xineramaproto-1.1-r1.ebuild:
diff --git a/x11-proto/xineramaproto/files/digest-xineramaproto-1.1.2 b/x11-proto/xineramaproto/files/digest-xineramaproto-1.1.2
new file mode 100644
index 000000000000..f3f6f1c86945
--- /dev/null
+++ b/x11-proto/xineramaproto/files/digest-xineramaproto-1.1.2
@@ -0,0 +1 @@
+MD5 aedc285fffda0dd9d3df98b42f3dfe2d xineramaproto-1.1.2.tar.bz2 38293
diff --git a/x11-proto/xineramaproto/xineramaproto-1.1.2.ebuild b/x11-proto/xineramaproto/xineramaproto-1.1.2.ebuild
new file mode 100644
index 000000000000..f9a8b79e4222
--- /dev/null
+++ b/x11-proto/xineramaproto/xineramaproto-1.1.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-proto/xineramaproto/xineramaproto-1.1.2.ebuild,v 1.1 2005/12/17 21:15:55 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Xinerama protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xproto/ChangeLog b/x11-proto/xproto/ChangeLog
index 5a0f72e8362d..c33598be3844 100644
--- a/x11-proto/xproto/ChangeLog
+++ b/x11-proto/xproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/ChangeLog,v 1.11 2005/12/09 07:50:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/ChangeLog,v 1.12 2005/12/17 21:16:30 joshuabaergen Exp $
+
+*xproto-7.0.4 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xproto-7.0.4.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -xproto-7.0.ebuild,
   -xproto-7.0_p20050917.ebuild, -xproto-7.0.1.ebuild, -xproto-7.0.2.ebuild:
diff --git a/x11-proto/xproto/files/digest-xproto-7.0.4 b/x11-proto/xproto/files/digest-xproto-7.0.4
new file mode 100644
index 000000000000..7dbfde3a8b78
--- /dev/null
+++ b/x11-proto/xproto/files/digest-xproto-7.0.4
@@ -0,0 +1 @@
+MD5 f15b8704acc4af8b67fba5ef46b6b1cb xproto-7.0.4.tar.bz2 127285
diff --git a/x11-proto/xproto/xproto-7.0.4.ebuild b/x11-proto/xproto/xproto-7.0.4.ebuild
new file mode 100644
index 000000000000..075833d92a50
--- /dev/null
+++ b/x11-proto/xproto/xproto-7.0.4.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-proto/xproto/xproto-7.0.4.ebuild,v 1.1 2005/12/17 21:16:30 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xproto protocol headers"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	x-modular_unpack_source
+
+	x-modular_reconf_source
+}
diff --git a/x11-proto/xproxymanagementprotocol/ChangeLog b/x11-proto/xproxymanagementprotocol/ChangeLog
index cf5112993f9a..789d734c1734 100644
--- a/x11-proto/xproxymanagementprotocol/ChangeLog
+++ b/x11-proto/xproxymanagementprotocol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xproxymanagementprotocol
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproxymanagementprotocol/ChangeLog,v 1.6 2005/12/09 07:50:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproxymanagementprotocol/ChangeLog,v 1.7 2005/12/17 21:17:10 joshuabaergen Exp $
+
+*xproxymanagementprotocol-1.0.2 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xproxymanagementprotocol-1.0.2.ebuild:
+  Bump for 7.0RC4.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xproxymanagementprotocol-1.0.ebuild:
diff --git a/x11-proto/xproxymanagementprotocol/files/digest-xproxymanagementprotocol-1.0.2 b/x11-proto/xproxymanagementprotocol/files/digest-xproxymanagementprotocol-1.0.2
new file mode 100644
index 000000000000..bdef60c49b1d
--- /dev/null
+++ b/x11-proto/xproxymanagementprotocol/files/digest-xproxymanagementprotocol-1.0.2
@@ -0,0 +1 @@
+MD5 730fa5beb16a913b92ef9808dcb6807e xproxymanagementprotocol-1.0.2.tar.bz2 36966
diff --git a/x11-proto/xproxymanagementprotocol/xproxymanagementprotocol-1.0.2.ebuild b/x11-proto/xproxymanagementprotocol/xproxymanagementprotocol-1.0.2.ebuild
new file mode 100644
index 000000000000..7188add5df19
--- /dev/null
+++ b/x11-proto/xproxymanagementprotocol/xproxymanagementprotocol-1.0.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-proto/xproxymanagementprotocol/xproxymanagementprotocol-1.0.2.ebuild,v 1.1 2005/12/17 21:17:10 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org PM protocol headers"
+KEYWORDS="~arm ~mips ~ppc ~s390 ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"