10 files changed, 12 insertions, 13 deletions

diff --git a/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/gccmakedep_1.0.2.bb
index f9dc1f3d3e..e943b70aa5 100644
--- a/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb
+++ b/meta/packages/xorg-util/gccmakedep_1.0.2.bb
@@ -4,3 +4,4 @@ require xorg-util-common.inc
 
 #DEPENDS += " "
 
+PE = "1"
diff --git a/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/imake_1.0.2.bb
index b2b11cf038..62611cc899 100644
--- a/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb
+++ b/meta/packages/xorg-util/imake_1.0.2.bb
@@ -4,3 +4,4 @@ DESCRIPTION = "imake utility"
 
 DEPENDS += " perl xproto"
 
+PE = "1"
diff --git a/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/lndir_1.0.1.bb
index 09a7787ee3..a071d28660 100644
--- a/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb
+++ b/meta/packages/xorg-util/lndir_1.0.1.bb
@@ -4,3 +4,4 @@ require xorg-util-common.inc
 
 DEPENDS += " xproto"
 
+PE = "1"
diff --git a/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-util/makedepend-native_1.0.0.bb
index 1b8476be47..833d2daa92 100644
--- a/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-util/makedepend-native_1.0.0.bb
@@ -3,8 +3,9 @@ inherit native
 
 #DESCRIPTION = ""
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/makedepend-${PV}.tar.bz2"
-S="${WORKDIR}/makedepend-${PV}"
+XORG_PN = "makedepend"
+S = "${WORKDIR}/makedepend-${PV}"
 
 DEPENDS += " util-macros-native xproto-native"
 
+PE = "1"
diff --git a/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb b/meta/packages/xorg-util/makedepend_1.0.0.bb
index 09a7787ee3..a071d28660 100644
--- a/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-util/makedepend_1.0.0.bb
@@ -4,3 +4,4 @@ require xorg-util-common.inc
 
 DEPENDS += " xproto"
 
+PE = "1"
diff --git a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb b/meta/packages/xorg-util/util-macros-native_1.1.5.bb
index 64e0550571..2728e83e18 100644
--- a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb
+++ b/meta/packages/xorg-util/util-macros-native_1.1.5.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "X autotools macros"
 SECTION = "x11/libs"
 LICENSE= "Xorg"
+PE = "1"
 
 SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \
            file://unbreak_cross_compile.patch;patch=1 "
diff --git a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
deleted file mode 100644
index 239750bb80..0000000000
--- a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2"
-S = "${WORKDIR}/util-macros-${PV}"
-
-inherit native autotools pkgconfig
-
diff --git a/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb b/meta/packages/xorg-util/util-macros_1.1.5.bb
index 06dd0a5d73..7fa9a07c05 100644
--- a/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb
+++ b/meta/packages/xorg-util/util-macros_1.1.5.bb
@@ -2,7 +2,7 @@ require xorg-util-common.inc
 
 DESCRIPTION = "X autotools macros"
 
-PR = "r1"
+PE = "1"
 
 SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \
            file://unbreak_cross_compile.patch;patch=1 "
diff --git a/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb
index f1b6b0d4f7..c0a3974d26 100644
--- a/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb
+++ b/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb
@@ -3,5 +3,6 @@ require xorg-util-common.inc
 #DESCRIPTION = ""
 
 #DEPENDS += " "
+PE = "1"
 
 FILES_${PN} += " /usr/lib/X11/config"
diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/packages/xorg-util/xorg-util-common.inc
index 3cbc346bf0..4dc547f105 100644
--- a/meta/packages/xorg-util/xorg-util-common.inc
+++ b/meta/packages/xorg-util/xorg-util-common.inc
@@ -4,7 +4,8 @@ LICENSE = "MIT-X"
 
 #DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/util/${XORG_PN}-${PV}.tar.gz"
+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}/util/${XORG_PN}-${PV}.tar.gz"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig