From 1b506a31ec25abe651d5b431b8a10956bc569517 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 3 May 2006 23:34:28 +0000
Subject: xorg SRC_URIs: some updates after upstream renamed things (add X11R7
 into filenames/checkout diectories). There will be other packages suffering
 this problem. Also add missing kbproto DEPENDS to libxt.

---
 packages/xlibs/libxt_1.0.0.bb       | 6 +++---
 packages/xlibs/util-macros_1.0.1.bb | 4 +++-
 packages/xproto/proto-common.inc    | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xlibs/libxt_1.0.0.bb
index 0f9fbf1860..be1b4c94e9 100644
--- a/packages/xlibs/libxt_1.0.0.bb
+++ b/packages/xlibs/libxt_1.0.0.bb
@@ -4,11 +4,11 @@ PRIORITY = "optional"
 #MAINTAINER = ""
 LICENSE =  "X-MIT"
 
-DEPENDS = "libx11 libsm util-macros"
+DEPENDS = "libx11 libsm util-macros kbproto"
 PROVIDES = "xt"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-${PV}.tar.bz2"
-S = "${WORKDIR}/libXt-${PV}"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/libXt-X11R7.0-${PV}"
 
 inherit autotools pkgconfig 
 
diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xlibs/util-macros_1.0.1.bb
index 87e2ecfa62..c019e94780 100644
--- a/packages/xlibs/util-macros_1.0.1.bb
+++ b/packages/xlibs/util-macros_1.0.1.bb
@@ -3,7 +3,9 @@ SECTION = "x11/libs"
 LICENSE= "Xorg"
 #MAINTAINER = ""
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc
index 4a712a810a..f35a791171 100644
--- a/packages/xproto/proto-common.inc
+++ b/packages/xproto/proto-common.inc
@@ -3,7 +3,9 @@ SECTION = "x11/libs"
 LICENSE= "MIT-X"
 #MAINTAINER = ""
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-X11R7.0-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools pkgconfig
 
-- 
cgit v1.2.3