xorg-*: Massive rename to conform to X11R7.x_a.b.c versioning and xorg-* directory structure.

	This is the first step for the update to X11R7.1.  
	This will not build and will be followed by more patches and updates.

44 files changed, 129 insertions, 0 deletions

diff --git a/packages/xorg-proto/.mtn2git_empty b/packages/xorg-proto/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-proto/.mtn2git_empty
diff --git a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
new file mode 100644
index 0000000000..0989abb63c
--- /dev/null
+++ b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "compositeext"
diff --git a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
new file mode 100644
index 0000000000..bb55a2022e
--- /dev/null
+++ b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
+CONFLICTS = "compositeext"
diff --git a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..cde80f0ffa
--- /dev/null
+++ b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "damageext"
diff --git a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
new file mode 100644
index 0000000000..2be69994a8
--- /dev/null
+++ b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "fixesext"
diff --git a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
new file mode 100644
index 0000000000..8e552e6bc5
--- /dev/null
+++ b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
+CONFLICTS = "fixesext"
diff --git a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..fafe3d3bef
--- /dev/null
+++ b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "randrext"
diff --git a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
new file mode 100644
index 0000000000..9e2cafceb8
--- /dev/null
+++ b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "recordext"
diff --git a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
new file mode 100644
index 0000000000..7f9febd8fa
--- /dev/null
+++ b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "renderext"
diff --git a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..e210b894ee
--- /dev/null
+++ b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "resourceext"
diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
new file mode 100644
index 0000000000..1ae2522d5f
--- /dev/null
+++ b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+PROVIDES = "xextensions"
diff --git a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
new file mode 100644
index 0000000000..3d7166c741
--- /dev/null
+++ b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "xxf86dgaext"
diff --git a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
new file mode 100644
index 0000000000..9ce9a207b8
--- /dev/null
+++ b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "xxf86vmext"
diff --git a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc
new file mode 100644
index 0000000000..65dfd4207a
--- /dev/null
+++ b/packages/xorg-proto/xorg-proto-common.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}"
+
+XORG_RELEASE ?= "X11R7.0"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/xorg-proto/xproto-native_6.6.2.bb b/packages/xorg-proto/xproto-native_6.6.2.bb
new file mode 100644
index 0000000000..44ccb5f035
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_6.6.2.bb
@@ -0,0 +1,4 @@
+SECTION = "unknown"
+include xproto_${PV}.bb
+inherit native
+PROVIDES = ""
diff --git a/packages/xorg-proto/xproto-native_cvs.bb b/packages/xorg-proto/xproto-native_cvs.bb
new file mode 100644
index 0000000000..7b768a8079
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_cvs.bb
@@ -0,0 +1,4 @@
+SECTION = "unknown"
+include xproto_cvs.bb
+inherit native
+PROVIDES = ""
diff --git a/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
new file mode 100644
index 0000000000..594a351155
--- /dev/null
+++ b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
@@ -0,0 +1,13 @@
+LICENSE= "MIT"
+SECTION = "x11/libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "X protocol and ancillary headers."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226"
+S = "${WORKDIR}/Xproto"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xorg-proto/xproto_6.6.2.bb b/packages/xorg-proto/xproto_6.6.2.bb
new file mode 100644
index 0000000000..b5cf751053
--- /dev/null
+++ b/packages/xorg-proto/xproto_6.6.2.bb
@@ -0,0 +1,13 @@
+SECTION = "x11/libs"
+LICENSE= "MIT"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "X protocol and ancillary headers."
+
+SRC_URI = "${XLIBS_MIRROR}/xproto-${PV}.tar.gz"
+S = "${WORKDIR}/xproto-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xorg-proto/xproto_cvs.bb b/packages/xorg-proto/xproto_cvs.bb
new file mode 100644
index 0000000000..1d9c96c87d
--- /dev/null
+++ b/packages/xorg-proto/xproto_cvs.bb
@@ -0,0 +1,15 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "MIT"
+SECTION = "x11/libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "X protocol and ancillary headers."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto"
+S = "${WORKDIR}/Xproto"
+
+inherit autotools pkgconfig
+
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc