45 files changed, 85 insertions, 210 deletions

diff --git a/meta/packages/xorg-proto/applewmproto_1.0.3.bb b/meta/packages/xorg-proto/applewmproto_1.0.3.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/applewmproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/applewmproto_1.0.3.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
index 51836203a3..e86417195d 100644
--- a/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
+++ b/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
@@ -1,10 +1,7 @@
-require xorg-proto-common.inc
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-PE = "1"
+require bigreqsproto_${PV}.bb
+
+PR = "r1"
 
 XORG_PN = "bigreqsproto"
-S = "${WORKDIR}/bigreqsproto-${PV}"
 
-inherit native autotools pkgconfig
+inherit native
diff --git a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
+++ b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/calibrateproto_git.bb b/meta/packages/xorg-proto/calibrateproto_git.bb
index 68c57ff3c7..60308601b9 100644
--- a/meta/packages/xorg-proto/calibrateproto_git.bb
+++ b/meta/packages/xorg-proto/calibrateproto_git.bb
@@ -1,11 +1,11 @@
 require xorg-proto-common.inc
 
-DESCRIPTION = " Touchscreen calibration protocol"
+DESCRIPTION = "Touchscreen calibration protocol"
 
 PV = "0.0+git${SRCDATE}"
 PR = "r1"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04 \
            file://coords.patch;patch=1"
-S = "${WORKDIR}/git"
 
+S = "${WORKDIR}/git"
diff --git a/meta/packages/xorg-proto/compositeproto_0.2.2.bb b/meta/packages/xorg-proto/compositeproto_0.2.2.bb
index 4f265581c8..2a027a248c 100644
--- a/meta/packages/xorg-proto/compositeproto_0.2.2.bb
+++ b/meta/packages/xorg-proto/compositeproto_0.2.2.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
 CONFLICTS = "compositeext"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/compositeproto_0.3.1.bb b/meta/packages/xorg-proto/compositeproto_0.3.1.bb
index 4f265581c8..2a027a248c 100644
--- a/meta/packages/xorg-proto/compositeproto_0.3.1.bb
+++ b/meta/packages/xorg-proto/compositeproto_0.3.1.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
 CONFLICTS = "compositeext"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/damageproto_1.1.0.bb b/meta/packages/xorg-proto/damageproto_1.1.0.bb
index ae54c06a64..202ec2874f 100644
--- a/meta/packages/xorg-proto/damageproto_1.1.0.bb
+++ b/meta/packages/xorg-proto/damageproto_1.1.0.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
-PE = "1"
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
 
 CONFLICTS = "damageext"
+PR = "r1"
+PE = "1"
diff --git a/meta/packages/xorg-proto/dmxproto_2.2.2.bb b/meta/packages/xorg-proto/dmxproto_2.2.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/dmxproto_2.2.2.bb
+++ b/meta/packages/xorg-proto/dmxproto_2.2.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/evieext_1.0.2.bb b/meta/packages/xorg-proto/evieext_1.0.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/evieext_1.0.2.bb
+++ b/meta/packages/xorg-proto/evieext_1.0.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/fixesproto_4.0.bb b/meta/packages/xorg-proto/fixesproto_4.0.bb
index 6c2c9a9ef3..1bc36e00da 100644
--- a/meta/packages/xorg-proto/fixesproto_4.0.bb
+++ b/meta/packages/xorg-proto/fixesproto_4.0.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
 CONFLICTS = "fixesext"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
index 2c3970734e..f6df67f59e 100644
--- a/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
+++ b/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
@@ -1,10 +1,7 @@
-require xorg-proto-common.inc
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-PE = "1"
+require fontcacheproto_${PV}.bb
+
+PR = "r1"
 
 XORG_PN = "fontcacheproto"
-S = "${WORKDIR}/fontcacheproto-${PV}"
 
-inherit native autotools pkgconfig
+inherit native
diff --git a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb
+++ b/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb b/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb
index a6467301b7..4371a07836 100644
--- a/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb
+++ b/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb
@@ -1,10 +1,9 @@
-require xorg-proto-common.inc
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-PE = "1"
+require fontsproto_${PV}.bb
+
+PR = "r1"
 
 XORG_PN = "fontsproto"
+
 S = "${WORKDIR}/fontsproto-${PV}"
 
-inherit native autotools pkgconfig
+inherit native
diff --git a/meta/packages/xorg-proto/fontsproto_2.0.2.bb b/meta/packages/xorg-proto/fontsproto_2.0.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/fontsproto_2.0.2.bb
+++ b/meta/packages/xorg-proto/fontsproto_2.0.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/glproto_1.4.8.bb b/meta/packages/xorg-proto/glproto_1.4.8.bb
index 7a4888d489..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/glproto_1.4.8.bb
+++ b/meta/packages/xorg-proto/glproto_1.4.8.bb
@@ -1,6 +1,4 @@
 require xorg-proto-common.inc
-PE="1"
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
+PR = "r1"
+PE = "1"
diff --git a/meta/packages/xorg-proto/inputproto-native_1.4.1.bb b/meta/packages/xorg-proto/inputproto-native_1.4.1.bb
index 3a9ea4492f..11e0dae601 100644
--- a/meta/packages/xorg-proto/inputproto-native_1.4.1.bb
+++ b/meta/packages/xorg-proto/inputproto-native_1.4.1.bb
@@ -1,10 +1,7 @@
-require xorg-proto-common.inc
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-PE = "1"
+require inputproto_${PV}.bb
+
+PR = "r1"
 
 XORG_PN = "inputproto"
-S = "${WORKDIR}/inputproto-${PV}"
 
-inherit native autotools pkgconfig
+inherit native
diff --git a/meta/packages/xorg-proto/inputproto_1.4.1.bb b/meta/packages/xorg-proto/inputproto_1.4.1.bb
index 40af1d2115..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/inputproto_1.4.1.bb
+++ b/meta/packages/xorg-proto/inputproto_1.4.1.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
-PE = "1"
 
-#DESCRIPTION = ""
+PR = "r1"
+PE = "1"
diff --git a/meta/packages/xorg-proto/kbproto-native_1.0.2.bb b/meta/packages/xorg-proto/kbproto-native_1.0.2.bb
deleted file mode 100644
index ec903bdea3..0000000000
--- a/meta/packages/xorg-proto/kbproto-native_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-PE = "1"
-
-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-native_1.0.3.bb b/meta/packages/xorg-proto/kbproto-native_1.0.3.bb
new file mode 100644
index 0000000000..68c677c07b
--- /dev/null
+++ b/meta/packages/xorg-proto/kbproto-native_1.0.3.bb
@@ -0,0 +1,7 @@
+require kbproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "kbproto"
+
+inherit native
diff --git a/meta/packages/xorg-proto/kbproto_1.0.3.bb b/meta/packages/xorg-proto/kbproto_1.0.3.bb
index 6c814f29f8..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/kbproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/kbproto_1.0.3.bb
@@ -1,10 +1,4 @@
 require xorg-proto-common.inc
 
+PR = "r1"
 PE = "1"
-
-SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-1.0.3.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-1.0.3"
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/printproto_1.0.3.bb b/meta/packages/xorg-proto/printproto_1.0.3.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/printproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/printproto_1.0.3.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/randrproto_1.2.1.bb b/meta/packages/xorg-proto/randrproto_1.2.1.bb
index 1116da8f93..eb8c7e0147 100644
--- a/meta/packages/xorg-proto/randrproto_1.2.1.bb
+++ b/meta/packages/xorg-proto/randrproto_1.2.1.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
-PE = "1"
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
 
 CONFLICTS = "randrext"
+PR = "r1"
+PE = "1"
diff --git a/meta/packages/xorg-proto/recordproto_1.13.2.bb b/meta/packages/xorg-proto/recordproto_1.13.2.bb
index 7ba51b8490..af63403600 100644
--- a/meta/packages/xorg-proto/recordproto_1.13.2.bb
+++ b/meta/packages/xorg-proto/recordproto_1.13.2.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
 CONFLICTS = "recordext"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/renderproto_0.9.2.bb b/meta/packages/xorg-proto/renderproto_0.9.2.bb
index 5c64e593db..39f4b66be7 100644
--- a/meta/packages/xorg-proto/renderproto_0.9.2.bb
+++ b/meta/packages/xorg-proto/renderproto_0.9.2.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
 CONFLICTS = "renderext"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/resourceproto_1.0.2.bb b/meta/packages/xorg-proto/resourceproto_1.0.2.bb
index fa10154df4..1fb8aa7f12 100644
--- a/meta/packages/xorg-proto/resourceproto_1.0.2.bb
+++ b/meta/packages/xorg-proto/resourceproto_1.0.2.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
 CONFLICTS = "resourceext"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb b/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb
+++ b/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/trapproto_3.4.3.bb b/meta/packages/xorg-proto/trapproto_3.4.3.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/trapproto_3.4.3.bb
+++ b/meta/packages/xorg-proto/trapproto_3.4.3.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/videoproto_2.2.2.bb b/meta/packages/xorg-proto/videoproto_2.2.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/videoproto_2.2.2.bb
+++ b/meta/packages/xorg-proto/videoproto_2.2.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/windowswmproto_1.0.3.bb b/meta/packages/xorg-proto/windowswmproto_1.0.3.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/windowswmproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/windowswmproto_1.0.3.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
index 6fc828826e..417a2aaf13 100644
--- a/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
+++ b/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
@@ -1,10 +1,7 @@
-require xorg-proto-common.inc
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-PE = "1"
+require xcmiscproto_${PV}.bb
+
+PR = "r1"
 
 XORG_PN = "xcmiscproto"
-S = "${WORKDIR}/xcmiscproto-${PV}"
 
-inherit native autotools pkgconfig
+inherit native
diff --git a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/xextproto-native_7.0.2.bb b/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
index 5707aac5d1..ff2bc4ffd3 100644
--- a/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
+++ b/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
@@ -1,12 +1,7 @@
-require xorg-proto-common.inc
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-PE = "1"
+require xextproto_${PV}.bb
 
-XORG_PN = "xextproto"
-S = "${WORKDIR}/xextproto-${PV}"
+PR = "r1"
 
-inherit native autotools pkgconfig
+XORG_PN = "xextproto"
 
-#PROVIDES = "xextensions-native"
+inherit native
diff --git a/meta/packages/xorg-proto/xextproto_7.0.2.bb b/meta/packages/xorg-proto/xextproto_7.0.2.bb
index 94bdb6e296..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xextproto_7.0.2.bb
+++ b/meta/packages/xorg-proto/xextproto_7.0.2.bb
@@ -1,9 +1,4 @@
 require xorg-proto-common.inc
 
-#PROVIDES = "xextensions"
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
index d221b4eed8..b0ac594997 100644
--- a/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
@@ -1,10 +1,7 @@
-require xorg-proto-common.inc
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-PE = "1"
+require xf86bigfontproto_${PV}.bb
+
+PR = "r1"
 
 XORG_PN = "xf86bigfontproto"
-S = "${WORKDIR}/xf86bigfontproto-${PV}"
 
-inherit native autotools pkgconfig
+inherit native
diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/xf86dgaproto_2.0.2.bb b/meta/packages/xorg-proto/xf86dgaproto_2.0.2.bb
index 84f493c322..2e0e734858 100644
--- a/meta/packages/xorg-proto/xf86dgaproto_2.0.2.bb
+++ b/meta/packages/xorg-proto/xf86dgaproto_2.0.2.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
 CONFLICTS = "xxf86dgaext"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/xf86driproto_2.0.3.bb b/meta/packages/xorg-proto/xf86driproto_2.0.3.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xf86driproto_2.0.3.bb
+++ b/meta/packages/xorg-proto/xf86driproto_2.0.3.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb b/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb
+++ b/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/xf86rushproto_1.1.2.bb b/meta/packages/xorg-proto/xf86rushproto_1.1.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xf86rushproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86rushproto_1.1.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb b/meta/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
index b4b19ae524..946be11407 100644
--- a/meta/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
+++ b/meta/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
 CONFLICTS = "xxf86vmext"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/xineramaproto_1.1.2.bb b/meta/packages/xorg-proto/xineramaproto_1.1.2.bb
index cc8317ef12..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xineramaproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xineramaproto_1.1.2.bb
@@ -1,7 +1,4 @@
 require xorg-proto-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-proto/xorg-proto-common.inc b/meta/packages/xorg-proto/xorg-proto-common.inc
index 1dc4f12fc7..248bbc7e11 100644
--- a/meta/packages/xorg-proto/xorg-proto-common.inc
+++ b/meta/packages/xorg-proto/xorg-proto-common.inc
@@ -1,16 +1,16 @@
-DESCRIPTION = "X protocol headers"
+DESCRIPTION = "X protocol headers: ${XORG_PN}"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 
-#DEPENDS = ""
 XORG_PN = "${PN}"
-XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/proto/${XORG_PN}-${PV}.tar.bz2"
+
+SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2"
+
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
 do_stage() {
-        autotools_stage_all
+        autotools_stage_all
 }
diff --git a/meta/packages/xorg-proto/xproto-native_7.0.10.bb b/meta/packages/xorg-proto/xproto-native_7.0.10.bb
index 0af3130ae2..88ed38e93c 100644
--- a/meta/packages/xorg-proto/xproto-native_7.0.10.bb
+++ b/meta/packages/xorg-proto/xproto-native_7.0.10.bb
@@ -1,10 +1,7 @@
-require xorg-proto-common.inc
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-PE = "1"
+require xproto_${PV}.bb
+
+PR = "r1"
 
 XORG_PN = "xproto"
-S = "${WORKDIR}/xproto-${PV}"
 
-inherit native autotools pkgconfig
+inherit native
diff --git a/meta/packages/xorg-proto/xproto_7.0.10.bb b/meta/packages/xorg-proto/xproto_7.0.10.bb
index 3f598df1bb..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xproto_7.0.10.bb
+++ b/meta/packages/xorg-proto/xproto_7.0.10.bb
@@ -1,6 +1,4 @@
 require xorg-proto-common.inc
-PE = "1"
-
-#DESCRIPTION = ""
 
-#DEPENDS += " "
+PR = "r1"
+PE = "1"
diff --git a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
index 460f136d2d..9c3d9efa71 100644
--- a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
+++ b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
 
 PROVIDES="xproxymngproto"
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
+PR = "r1"
 PE = "1"