From a42d467032a56756bc78387eaa853aa11bbf3f86 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Tue, 3 Jul 2007 11:30:02 +0000
Subject: [PATCH] xorg-proto: X11 cleanup

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2084 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 ...applewmproto_X11R7.0-1.0.3.bb => applewmproto_1.0.3.bb} | 1 +
 ...ative_X11R7.0-1.0.2.bb => bigreqsproto-native_1.0.2.bb} | 1 +
 ...bigreqsproto_X11R7.0-1.0.2.bb => bigreqsproto_1.0.2.bb} | 1 +
 ...ositeproto_X11R7.1-0.3.1.bb => compositeproto_0.2.2.bb} | 1 +
 ...ositeproto_X11R7.0-0.2.2.bb => compositeproto_0.3.1.bb} | 1 +
 .../{dmxproto_X11R7.0-2.2.2.bb => dmxproto_2.2.2.bb}       | 2 ++
 .../{evieext_X11R7.0-1.0.2.bb => evieext_1.0.2.bb}         | 2 ++
 .../{fixesproto_X11R7.1-4.0.bb => fixesproto_4.0.bb}       | 1 +
 ...ive_X11R7.0-0.1.2.bb => fontcacheproto-native_0.1.2.bb} | 3 ++-
 meta/packages/xorg-proto/fontcacheproto_0.1.2.bb           | 7 +++++++
 meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb   | 5 -----
 ...-native_X11R7.0-2.0.2.bb => fontsproto-native_2.0.2.bb} | 3 ++-
 meta/packages/xorg-proto/fontsproto_2.0.2.bb               | 7 +++++++
 meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb       | 5 -----
 ...-native_X11R7.0-1.3.2.bb => inputproto-native_1.3.2.bb} | 5 +++--
 ...oto-native_X11R7.0-1.0.2.bb => kbproto-native_1.0.2.bb} | 5 +++--
 .../{kbproto_X11R7.1-1.0.3.bb => kbproto_1.0.3.bb}         | 2 ++
 meta/packages/xorg-proto/printproto_1.0.3.bb               | 7 +++++++
 meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb       | 5 -----
 ...recordproto_X11R7.0-1.13.2.bb => recordproto_1.13.2.bb} | 1 +
 .../{renderproto_X11R7.0-0.9.2.bb => renderproto_0.9.2.bb} | 1 +
 ...sourceproto_X11R7.0-1.0.2.bb => resourceproto_1.0.2.bb} | 1 +
 meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb           | 7 +++++++
 meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb   | 5 -----
 meta/packages/xorg-proto/trapproto_3.4.3.bb                | 7 +++++++
 meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb        | 5 -----
 meta/packages/xorg-proto/videoproto_2.2.2.bb               | 7 +++++++
 meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb       | 5 -----
 meta/packages/xorg-proto/windowswmproto_1.0.3.bb           | 7 +++++++
 meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb   | 5 -----
 ...native_X11R7.0-1.1.2.bb => xcmiscproto-native_1.1.2.bb} | 3 ++-
 meta/packages/xorg-proto/xcmiscproto_1.1.2.bb              | 7 +++++++
 meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb      | 5 -----
 ...o-native_X11R7.0-7.0.2.bb => xextproto-native_7.0.2.bb} | 3 ++-
 .../{xextproto_X11R7.0-7.0.2.bb => xextproto_7.0.2.bb}     | 2 ++
 ...e_X11R7.0-1.1.2.bb => xf86bigfontproto-native_1.1.2.bb} | 3 ++-
 meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb         | 7 +++++++
 meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb | 5 -----
 ...xf86dgaproto_X11R7.0-2.0.2.bb => xf86dgaproto_2.0.2.bb} | 1 +
 meta/packages/xorg-proto/xf86driproto_2.0.3.bb             | 7 +++++++
 meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb     | 5 -----
 meta/packages/xorg-proto/xf86miscproto_0.9.2.bb            | 7 +++++++
 meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb    | 5 -----
 meta/packages/xorg-proto/xf86rushproto_1.1.2.bb            | 7 +++++++
 meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb    | 5 -----
 ...odeproto_X11R7.0-2.2.2.bb => xf86vidmodeproto_2.2.2.bb} | 1 +
 meta/packages/xorg-proto/xineramaproto_1.1.2.bb            | 7 +++++++
 meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb    | 5 -----
 ..._X11R7.0-1.0.2.bb => xproxymanagementprotocol_1.0.2.bb} | 2 ++
 49 files changed, 128 insertions(+), 74 deletions(-)
 rename meta/packages/xorg-proto/{applewmproto_X11R7.0-1.0.3.bb => applewmproto_1.0.3.bb} (88%)
 rename meta/packages/xorg-proto/{bigreqsproto-native_X11R7.0-1.0.2.bb => bigreqsproto-native_1.0.2.bb} (96%)
 rename meta/packages/xorg-proto/{bigreqsproto_X11R7.0-1.0.2.bb => bigreqsproto_1.0.2.bb} (88%)
 rename meta/packages/xorg-proto/{compositeproto_X11R7.1-0.3.1.bb => compositeproto_0.2.2.bb} (91%)
 rename meta/packages/xorg-proto/{compositeproto_X11R7.0-0.2.2.bb => compositeproto_0.3.1.bb} (91%)
 rename meta/packages/xorg-proto/{dmxproto_X11R7.0-2.2.2.bb => dmxproto_2.2.2.bb} (86%)
 rename meta/packages/xorg-proto/{evieext_X11R7.0-1.0.2.bb => evieext_1.0.2.bb} (86%)
 rename meta/packages/xorg-proto/{fixesproto_X11R7.1-4.0.bb => fixesproto_4.0.bb} (90%)
 rename meta/packages/xorg-proto/{fontcacheproto-native_X11R7.0-0.1.2.bb => fontcacheproto-native_0.1.2.bb} (88%)
 create mode 100644 meta/packages/xorg-proto/fontcacheproto_0.1.2.bb
 delete mode 100644 meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
 rename meta/packages/xorg-proto/{fontsproto-native_X11R7.0-2.0.2.bb => fontsproto-native_2.0.2.bb} (87%)
 create mode 100644 meta/packages/xorg-proto/fontsproto_2.0.2.bb
 delete mode 100644 meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
 rename meta/packages/xorg-proto/{inputproto-native_X11R7.0-1.3.2.bb => inputproto-native_1.3.2.bb} (56%)
 rename meta/packages/xorg-proto/{kbproto-native_X11R7.0-1.0.2.bb => kbproto-native_1.0.2.bb} (57%)
 rename meta/packages/xorg-proto/{kbproto_X11R7.1-1.0.3.bb => kbproto_1.0.3.bb} (94%)
 create mode 100644 meta/packages/xorg-proto/printproto_1.0.3.bb
 delete mode 100644 meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
 rename meta/packages/xorg-proto/{recordproto_X11R7.0-1.13.2.bb => recordproto_1.13.2.bb} (91%)
 rename meta/packages/xorg-proto/{renderproto_X11R7.0-0.9.2.bb => renderproto_0.9.2.bb} (91%)
 rename meta/packages/xorg-proto/{resourceproto_X11R7.0-1.0.2.bb => resourceproto_1.0.2.bb} (91%)
 create mode 100644 meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb
 delete mode 100644 meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
 create mode 100644 meta/packages/xorg-proto/trapproto_3.4.3.bb
 delete mode 100644 meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
 create mode 100644 meta/packages/xorg-proto/videoproto_2.2.2.bb
 delete mode 100644 meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
 create mode 100644 meta/packages/xorg-proto/windowswmproto_1.0.3.bb
 delete mode 100644 meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
 rename meta/packages/xorg-proto/{xcmiscproto-native_X11R7.0-1.1.2.bb => xcmiscproto-native_1.1.2.bb} (88%)
 create mode 100644 meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
 delete mode 100644 meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
 rename meta/packages/xorg-proto/{xextproto-native_X11R7.0-7.0.2.bb => xextproto-native_7.0.2.bb} (89%)
 rename meta/packages/xorg-proto/{xextproto_X11R7.0-7.0.2.bb => xextproto_7.0.2.bb} (90%)
 rename meta/packages/xorg-proto/{xf86bigfontproto-native_X11R7.0-1.1.2.bb => xf86bigfontproto-native_1.1.2.bb} (88%)
 create mode 100644 meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
 delete mode 100644 meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
 rename meta/packages/xorg-proto/{xf86dgaproto_X11R7.0-2.0.2.bb => xf86dgaproto_2.0.2.bb} (91%)
 create mode 100644 meta/packages/xorg-proto/xf86driproto_2.0.3.bb
 delete mode 100644 meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
 create mode 100644 meta/packages/xorg-proto/xf86miscproto_0.9.2.bb
 delete mode 100644 meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
 create mode 100644 meta/packages/xorg-proto/xf86rushproto_1.1.2.bb
 delete mode 100644 meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
 rename meta/packages/xorg-proto/{xf86vidmodeproto_X11R7.0-2.2.2.bb => xf86vidmodeproto_2.2.2.bb} (91%)
 create mode 100644 meta/packages/xorg-proto/xineramaproto_1.1.2.bb
 delete mode 100644 meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
 rename meta/packages/xorg-proto/{xproxymanagementprotocol_X11R7.0-1.0.2.bb => xproxymanagementprotocol_1.0.2.bb} (90%)

diff --git a/meta/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/applewmproto_1.0.3.bb
similarity index 88%
rename from meta/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
rename to meta/packages/xorg-proto/applewmproto_1.0.3.bb
index 1f4cf97e70..cc8317ef12 100644
--- a/meta/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
+++ b/meta/packages/xorg-proto/applewmproto_1.0.3.bb
@@ -4,3 +4,4 @@ require xorg-proto-common.inc
 
 #DEPENDS += " "
 
+PE = "1"
diff --git a/meta/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
similarity index 96%
rename from meta/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
rename to meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
index f46c1da93e..f7883f32c0 100644
--- a/meta/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
+++ b/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
+PE = "1"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/bigreqsproto-${PV}.tar.bz2"
 S = "${WORKDIR}/bigreqsproto-${PV}"
diff --git a/meta/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
similarity index 88%
rename from meta/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
rename to meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
index 1f4cf97e70..cc8317ef12 100644
--- a/meta/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
+++ b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
@@ -4,3 +4,4 @@ require xorg-proto-common.inc
 
 #DEPENDS += " "
 
+PE = "1"
diff --git a/meta/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb b/meta/packages/xorg-proto/compositeproto_0.2.2.bb
similarity index 91%
rename from meta/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
rename to meta/packages/xorg-proto/compositeproto_0.2.2.bb
index 59eae3a0bb..4f265581c8 100644
--- a/meta/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
+++ b/meta/packages/xorg-proto/compositeproto_0.2.2.bb
@@ -5,3 +5,4 @@ require xorg-proto-common.inc
 #DEPENDS += " "
 
 CONFLICTS = "compositeext"
+PE = "1"
diff --git a/meta/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb b/meta/packages/xorg-proto/compositeproto_0.3.1.bb
similarity index 91%
rename from meta/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
rename to meta/packages/xorg-proto/compositeproto_0.3.1.bb
index 59eae3a0bb..4f265581c8 100644
--- a/meta/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
+++ b/meta/packages/xorg-proto/compositeproto_0.3.1.bb
@@ -5,3 +5,4 @@ require xorg-proto-common.inc
 #DEPENDS += " "
 
 CONFLICTS = "compositeext"
+PE = "1"
diff --git a/meta/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb b/meta/packages/xorg-proto/dmxproto_2.2.2.bb
similarity index 86%
rename from meta/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
rename to meta/packages/xorg-proto/dmxproto_2.2.2.bb
index d7cd7c8c86..cc8317ef12 100644
--- a/meta/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
+++ b/meta/packages/xorg-proto/dmxproto_2.2.2.bb
@@ -3,3 +3,5 @@ require xorg-proto-common.inc
 #DESCRIPTION = ""
 
 #DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/evieext_1.0.2.bb
similarity index 86%
rename from meta/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
rename to meta/packages/xorg-proto/evieext_1.0.2.bb
index d7cd7c8c86..cc8317ef12 100644
--- a/meta/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
+++ b/meta/packages/xorg-proto/evieext_1.0.2.bb
@@ -3,3 +3,5 @@ require xorg-proto-common.inc
 #DESCRIPTION = ""
 
 #DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb b/meta/packages/xorg-proto/fixesproto_4.0.bb
similarity index 90%
rename from meta/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
rename to meta/packages/xorg-proto/fixesproto_4.0.bb
index 16ff0441b5..6c2c9a9ef3 100644
--- a/meta/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
+++ b/meta/packages/xorg-proto/fixesproto_4.0.bb
@@ -5,3 +5,4 @@ require xorg-proto-common.inc
 #DEPENDS += " "
 
 CONFLICTS = "fixesext"
+PE = "1"
diff --git a/meta/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
similarity index 88%
rename from meta/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
rename to meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
index a9ff843cb3..46ce311621 100644
--- a/meta/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
+++ b/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
-LICENSE= "MIT-X"
+LICENSE = "MIT-X"
+PE = "1"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontcacheproto-${PV}.tar.bz2"
 S = "${WORKDIR}/fontcacheproto-${PV}"
diff --git a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb b/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb
similarity index 87%
rename from meta/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
rename to meta/packages/xorg-proto/fontsproto-native_2.0.2.bb
index 34a32f97be..8a8795623d 100644
--- a/meta/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
+++ b/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
-LICENSE= "MIT-X"
+LICENSE = "MIT-X"
+PE = "1"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontsproto-${PV}.tar.bz2"
 S = "${WORKDIR}/fontsproto-${PV}"
diff --git a/meta/packages/xorg-proto/fontsproto_2.0.2.bb b/meta/packages/xorg-proto/fontsproto_2.0.2.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/fontsproto_2.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb b/meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb b/meta/packages/xorg-proto/inputproto-native_1.3.2.bb
similarity index 56%
rename from meta/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
rename to meta/packages/xorg-proto/inputproto-native_1.3.2.bb
index c47701289d..ae9be32d39 100644
--- a/meta/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
+++ b/meta/packages/xorg-proto/inputproto-native_1.3.2.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
-LICENSE= "MIT-X"
+LICENSE = "MIT-X"
+PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/inputproto-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/proto/inputproto-${PV}.tar.bz2"
 S = "${WORKDIR}/inputproto-${PV}"
 
 inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/kbproto-native_1.0.2.bb
similarity index 57%
rename from meta/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
rename to meta/packages/xorg-proto/kbproto-native_1.0.2.bb
index e7d1f9c992..ec903bdea3 100644
--- a/meta/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
+++ b/meta/packages/xorg-proto/kbproto-native_1.0.2.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
-LICENSE= "MIT-X"
+LICENSE = "MIT-X"
+PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/kbproto-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/proto/kbproto-${PV}.tar.bz2"
 S = "${WORKDIR}/kbproto-${PV}"
 
 inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb b/meta/packages/xorg-proto/kbproto_1.0.3.bb
similarity index 94%
rename from meta/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb
rename to meta/packages/xorg-proto/kbproto_1.0.3.bb
index 813143995d..6c814f29f8 100644
--- a/meta/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb
+++ b/meta/packages/xorg-proto/kbproto_1.0.3.bb
@@ -1,5 +1,7 @@
 require xorg-proto-common.inc
 
+PE = "1"
+
 SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-1.0.3.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-1.0.3"
 
diff --git a/meta/packages/xorg-proto/printproto_1.0.3.bb b/meta/packages/xorg-proto/printproto_1.0.3.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/printproto_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb b/meta/packages/xorg-proto/recordproto_1.13.2.bb
similarity index 91%
rename from meta/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
rename to meta/packages/xorg-proto/recordproto_1.13.2.bb
index 255ab83609..7ba51b8490 100644
--- a/meta/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
+++ b/meta/packages/xorg-proto/recordproto_1.13.2.bb
@@ -5,3 +5,4 @@ require xorg-proto-common.inc
 #DEPENDS += " "
 
 CONFLICTS = "recordext"
+PE = "1"
diff --git a/meta/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb b/meta/packages/xorg-proto/renderproto_0.9.2.bb
similarity index 91%
rename from meta/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
rename to meta/packages/xorg-proto/renderproto_0.9.2.bb
index 881eed5240..5c64e593db 100644
--- a/meta/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
+++ b/meta/packages/xorg-proto/renderproto_0.9.2.bb
@@ -5,3 +5,4 @@ require xorg-proto-common.inc
 #DEPENDS += " "
 
 CONFLICTS = "renderext"
+PE = "1"
diff --git a/meta/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/resourceproto_1.0.2.bb
similarity index 91%
rename from meta/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
rename to meta/packages/xorg-proto/resourceproto_1.0.2.bb
index 231eb0b37f..fa10154df4 100644
--- a/meta/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
+++ b/meta/packages/xorg-proto/resourceproto_1.0.2.bb
@@ -5,3 +5,4 @@ require xorg-proto-common.inc
 #DEPENDS += " "
 
 CONFLICTS = "resourceext"
+PE = "1"
diff --git a/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb b/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb b/meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/trapproto_3.4.3.bb b/meta/packages/xorg-proto/trapproto_3.4.3.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/trapproto_3.4.3.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb b/meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/videoproto_2.2.2.bb b/meta/packages/xorg-proto/videoproto_2.2.2.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/videoproto_2.2.2.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb b/meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/windowswmproto_1.0.3.bb b/meta/packages/xorg-proto/windowswmproto_1.0.3.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/windowswmproto_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
similarity index 88%
rename from meta/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
rename to meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
index 1ccfc89032..5f1e669acd 100644
--- a/meta/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
+++ b/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
-LICENSE= "MIT-X"
+LICENSE = "MIT-X"
+PE = "1"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xcmiscproto-${PV}.tar.bz2"
 S = "${WORKDIR}/xcmiscproto-${PV}"
diff --git a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb b/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
similarity index 89%
rename from meta/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
rename to meta/packages/xorg-proto/xextproto-native_7.0.2.bb
index 25ee5d41e4..0a5534a1b1 100644
--- a/meta/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
+++ b/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
-LICENSE= "MIT-X"
+LICENSE = "MIT-X"
+PE = "1"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/protto/xextproto-${PV}.tar.bz2"
 S = "${WORKDIR}/xextproto-${PV}"
diff --git a/meta/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb b/meta/packages/xorg-proto/xextproto_7.0.2.bb
similarity index 90%
rename from meta/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
rename to meta/packages/xorg-proto/xextproto_7.0.2.bb
index 8f1d25bd37..94bdb6e296 100644
--- a/meta/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
+++ b/meta/packages/xorg-proto/xextproto_7.0.2.bb
@@ -5,3 +5,5 @@ require xorg-proto-common.inc
 #DESCRIPTION = ""
 
 #DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
similarity index 88%
rename from meta/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
rename to meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
index e37d738633..1b545fd205 100644
--- a/meta/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
-LICENSE= "MIT-X"
+LICENSE = "MIT-X"
+PE = "1"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xf86bigfontproto-${PV}.tar.bz2"
 S = "${WORKDIR}/xf86bigfontproto-${PV}"
diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb b/meta/packages/xorg-proto/xf86dgaproto_2.0.2.bb
similarity index 91%
rename from meta/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
rename to meta/packages/xorg-proto/xf86dgaproto_2.0.2.bb
index 18207c0307..84f493c322 100644
--- a/meta/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
+++ b/meta/packages/xorg-proto/xf86dgaproto_2.0.2.bb
@@ -5,3 +5,4 @@ require xorg-proto-common.inc
 #DEPENDS += " "
 
 CONFLICTS = "xxf86dgaext"
+PE = "1"
diff --git a/meta/packages/xorg-proto/xf86driproto_2.0.3.bb b/meta/packages/xorg-proto/xf86driproto_2.0.3.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86driproto_2.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb b/meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb b/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb b/meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xf86rushproto_1.1.2.bb b/meta/packages/xorg-proto/xf86rushproto_1.1.2.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86rushproto_1.1.2.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb b/meta/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
similarity index 91%
rename from meta/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
rename to meta/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
index d3acf1f590..b4b19ae524 100644
--- a/meta/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
+++ b/meta/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
@@ -5,3 +5,4 @@ require xorg-proto-common.inc
 #DEPENDS += " "
 
 CONFLICTS = "xxf86vmext"
+PE = "1"
diff --git a/meta/packages/xorg-proto/xineramaproto_1.1.2.bb b/meta/packages/xorg-proto/xineramaproto_1.1.2.bb
new file mode 100644
index 0000000000..cc8317ef12
--- /dev/null
+++ b/meta/packages/xorg-proto/xineramaproto_1.1.2.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+PE = "1"
diff --git a/meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
deleted file mode 100644
index d7cd7c8c86..0000000000
--- a/meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
similarity index 90%
rename from meta/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
rename to meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
index b265a53346..460f136d2d 100644
--- a/meta/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
+++ b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
@@ -4,3 +4,5 @@ PROVIDES="xproxymngproto"
 #DESCRIPTION = ""
 
 #DEPENDS += " "
+
+PE = "1"
-- 
2.40.1