fix dependencies for x11 packages

BKrev: 4066cafbSj1GGhLWDSwSyj9_VLpxQA

9 files changed, 7 insertions, 10 deletions

diff --git a/matchbox-desktop/matchbox-desktop_0.8.oe b/matchbox-desktop/matchbox-desktop_0.8.oe
index 7189bb7ca7..241c9dc611 100644
--- a/matchbox-desktop/matchbox-desktop_0.8.oe
+++ b/matchbox-desktop/matchbox-desktop_0.8.oe
@@ -1,6 +1,5 @@
 LICENSE = "GPL"
 DEPENDS = "virtual/libc libmatchbox"
-RDEPENDS = "libc6 libmatchbox"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-desktop/${PV}/matchbox-desktop-${PV}.tar.bz2"
 
diff --git a/matchbox-panel/matchbox-panel_0.8.1.oe b/matchbox-panel/matchbox-panel_0.8.1.oe
index 52f7eab1bf..a9d4c0d6f0 100644
--- a/matchbox-panel/matchbox-panel_0.8.1.oe
+++ b/matchbox-panel/matchbox-panel_0.8.1.oe
@@ -1,7 +1,6 @@
 DESCRIPTION = "Matchbox panel"
 LICENSE = "GPL"
 DEPENDS = "virtual/libc libmatchbox x11 xext xpm"
-RDEPENDS = "libc6 libmatchbox x11 xext matchbox-common"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2"
 S = "${WORKDIR}/matchbox-panel-${PV}"
diff --git a/matchbox-wm/matchbox-wm_0.8.1.oe b/matchbox-wm/matchbox-wm_0.8.1.oe
index b0e1c20081..071ac2fc41 100644
--- a/matchbox-wm/matchbox-wm_0.8.1.oe
+++ b/matchbox-wm/matchbox-wm_0.8.1.oe
@@ -1,7 +1,6 @@
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "virtual/libc libmatchbox x11 xext xcomposite xfixes xdamage xrender"
-RDEPENDS = "libc6 libmatchbox x11 xext xcomposite xfixes xdamage xrender"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
 	   file://${FILESDIR}/m4.patch;patch=1"
diff --git a/x11/x11-cvs.oe b/x11/x11-cvs.oe
index 62d7c1a402..ee7fc64cc9 100644
--- a/x11/x11-cvs.oe
+++ b/x11/x11-cvs.oe
@@ -3,10 +3,10 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 RDEPENDS = "libc6"
-DEPENDS = "virtual/libc xproto-cvs xextensions-cvs xau-cvs xtrans-cvs xdmcp-cvs"
+DEPENDS = "virtual/libc xproto xextensions xau xtrans xdmcp"
 PROVIDES = "x11"
 DESCRIPTION = "Base X libs."
-FILES_x11-cvs_append = " ${datadir}/X11"
+FILES_${PN}_append = " ${datadir}/X11"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11"
 S = "${WORKDIR}/X11"
diff --git a/xau/xau-cvs.oe b/xau/xau-cvs.oe
index dd3f659abc..513b2fa50a 100644
--- a/xau/xau-cvs.oe
+++ b/xau/xau-cvs.oe
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 RDEPENDS = "libc6"
-DEPENDS = "virtual/libc xproto-cvs"
+DEPENDS = "virtual/libc xproto"
 PROVIDES = "xau"
 DESCRIPTION = "Authorization Protocol for X."
 
diff --git a/xext/xext-cvs.oe b/xext/xext-cvs.oe
index d47f25ad74..7142a9ed2c 100644
--- a/xext/xext-cvs.oe
+++ b/xext/xext-cvs.oe
@@ -2,7 +2,7 @@ PV = "0.0cvs${CVSDATE}"
 DESCRIPTION = "X Server Extension library"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "virtual/libc xproto-cvs x11-cvs xextensions-cvs"
+DEPENDS = "virtual/libc xproto x11 xextensions"
 PROVIDES = "xext"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xext"
diff --git a/xrandr/xrandr-cvs.oe b/xrandr/xrandr-cvs.oe
index 9668477e43..e41021db4b 100644
--- a/xrandr/xrandr-cvs.oe
+++ b/xrandr/xrandr-cvs.oe
@@ -1,6 +1,6 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
-DEPENDS = "virtual/libc randr-cvs x11-cvs render-cvs xrender-cvs xext-cvs"
+DEPENDS = "virtual/libc randr x11 render xrender xext"
 PROVIDES = "xrandr"
 DESCRIPTION = "X Resize and Rotate extension library."
 
diff --git a/xrender/xrender-cvs.oe b/xrender/xrender-cvs.oe
index 37f2f6c8da..097343e534 100644
--- a/xrender/xrender-cvs.oe
+++ b/xrender/xrender-cvs.oe
@@ -1,6 +1,6 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
-DEPENDS = "virtual/libc render-cvs x11-cvs"
+DEPENDS = "virtual/libc render x11"
 PROVIDES = "xrender"
 DESCRIPTION = "X Render extension library."
 
diff --git a/xserver/xserver-cvs.oe b/xserver/xserver-cvs.oe
index 4e48425a6b..20f7850e14 100644
--- a/xserver/xserver-cvs.oe
+++ b/xserver/xserver-cvs.oe
@@ -1,6 +1,6 @@
 PV = "0.0cvs${CVSDATE}"
 RDEPENDS = "libc6"
-DEPENDS = "virtual/libc tslib xproto-cvs xdmcp-cvs xextensions-cvs xtrans-cvs xau-cvs x11-cvs xext-cvs randr-cvs render-cvs xrender-cvs xrandr-cvs fixesext-cvs damageext-cvs xfont-cvs resourceext-cvs compositeext-cvs"
+DEPENDS = "virtual/libc tslib xproto xdmcp xextensions xtrans xau x11 xext randr render xrender xrandr fixesext damageext xfont resourceext compositeext"
 PROVIDES = "xserver"
 PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-ati ${PN}-doc ${PN}-dev ${PN}-locale"
 DESCRIPTION = "X server from freedesktop.org"