Update xlibs to follow restructuring in OE (in preparation for X11R7)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@341 311d38ba-8fff-0310-9ca6-ca027cbcb966

77 files changed, 86 insertions, 76 deletions

diff --git a/openembedded/packages/cairo/cairo_1.0.0.bb b/openembedded/packages/cairo/cairo_1.0.0.bb
index 84cb581174..10603e3f2f 100644
--- a/openembedded/packages/cairo/cairo_1.0.0.bb
+++ b/openembedded/packages/cairo/cairo_1.0.0.bb
@@ -1,7 +1,7 @@
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "x11 libpng fontconfig libxrender"
+DEPENDS = "libx11 libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 PR = "r1"
diff --git a/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
index fbebed2e45..e2065b3faa 100644
--- a/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
+++ b/openembedded/packages/gtk+/gtk+_2.6.4-1.osso7.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
 PR = "r1"
 
 S = "${WORKDIR}/gtk+2.0-2.6.4/upstream/tarballs/gtk+-2.6.4/"
diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb
index 260a03684e..b276072310 100644
--- a/openembedded/packages/gtk+/gtk+_2.6.7.bb
+++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb
@@ -4,7 +4,7 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project
 HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
 PR = "r4"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
diff --git a/openembedded/packages/gtk+/gtk+_2.8.16.bb b/openembedded/packages/gtk+/gtk+_2.8.16.bb
index 875efa8d39..acd3be5f27 100644
--- a/openembedded/packages/gtk+/gtk+_2.8.16.bb
+++ b/openembedded/packages/gtk+/gtk+_2.8.16.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
 PR = "r2"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
diff --git a/openembedded/packages/libfakekey/libfakekey_svn.bb b/openembedded/packages/libfakekey/libfakekey_svn.bb
index 7cdd557463..eec4d6506d 100644
--- a/openembedded/packages/libfakekey/libfakekey_svn.bb
+++ b/openembedded/packages/libfakekey/libfakekey_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Matchbox keyboard"
 LICENSE = "GPL"
-DEPENDS = "xtst"
+DEPENDS = "libxtst"
 SECTION = "x11/wm"
 PR="r1"
 PV = "0.0+svn${SRCDATE}"
diff --git a/openembedded/packages/libmatchbox/libmatchbox.inc b/openembedded/packages/libmatchbox/libmatchbox.inc
index e8700cb7b6..974014f276 100644
--- a/openembedded/packages/libmatchbox/libmatchbox.inc
+++ b/openembedded/packages/libmatchbox/libmatchbox.inc
@@ -1,7 +1,7 @@
 SECTION = "x11/libs"
 DESCRIPTION = "Matchbox window manager core library"
 LICENSE = "GPL"
-DEPENDS = "x11 xext expat libxft jpeg libpng zlib libxsettings-client"
+DEPENDS = "libx11 libxext expat libxft jpeg libpng zlib libxsettings-client"
 PR="r2"
 
 inherit autotools pkgconfig
diff --git a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
index 1ccb6e4eb6..7e1b4df2c4 100644
--- a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
+++ b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
@@ -1,7 +1,7 @@
 SECTION = "gpe/libs"
 LICENSE = "BSD-X"
 PRIORITY = "optional"
-DEPENDS = "libxsettings x11"
+DEPENDS = "libxsettings libx11"
 PR = "r1"
 
 inherit autotools pkgconfig gpe
diff --git a/openembedded/packages/libxsettings/libxsettings_0.11.bb b/openembedded/packages/libxsettings/libxsettings_0.11.bb
index 6ff786e3bd..caf2bc67ae 100644
--- a/openembedded/packages/libxsettings/libxsettings_0.11.bb
+++ b/openembedded/packages/libxsettings/libxsettings_0.11.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/libs"
 LICENSE = "BSD-X"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
 
 inherit gpe
 
diff --git a/openembedded/packages/lirc/lirc_0.7.1.bb b/openembedded/packages/lirc/lirc_0.7.1.bb
index c3eaa3aa87..cd65dcedae 100644
--- a/openembedded/packages/lirc/lirc_0.7.1.bb
+++ b/openembedded/packages/lirc/lirc_0.7.1.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/kernel x11 xau libsm ice"
+DEPENDS = "virtual/kernel libx11 libxau libsm libice"
 PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
diff --git a/openembedded/packages/maemo/xpext_1.0-5.bb b/openembedded/packages/maemo/xpext_1.0-5.bb
index cd5aec2d13..75b7903e84 100644
--- a/openembedded/packages/maemo/xpext_1.0-5.bb
+++ b/openembedded/packages/maemo/xpext_1.0-5.bb
@@ -3,7 +3,7 @@ LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "x11 xextensions xext"
+DEPENDS = "libx11 xextensions libxext"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
            file://auxdir.patch;patch=1;pnum=0"
diff --git a/openembedded/packages/maemo/xsp_1.0.0-8.bb b/openembedded/packages/maemo/xsp_1.0.0-8.bb
index 0c4a4c62f8..068193c6aa 100644
--- a/openembedded/packages/maemo/xsp_1.0.0-8.bb
+++ b/openembedded/packages/maemo/xsp_1.0.0-8.bb
@@ -3,7 +3,7 @@ LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "x11 xextensions xext xpext"
+DEPENDS = "libx11 xextensions libxext xpext"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
 S = "${WORKDIR}/Xsp"
diff --git a/openembedded/packages/matchbox-panel/matchbox-panel.inc b/openembedded/packages/matchbox-panel/matchbox-panel.inc
index 7ae9342b42..d5d3551619 100644
--- a/openembedded/packages/matchbox-panel/matchbox-panel.inc
+++ b/openembedded/packages/matchbox-panel/matchbox-panel.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel wireless-tools"
+DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
 SECTION = "x11/wm"
 
 inherit autotools pkgconfig gettext
diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb
index 69bddc3544..c158f590ce 100644
--- a/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb
+++ b/openembedded/packages/matchbox-wm/matchbox-wm_0.9.5.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
 PR="r0"
 
diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
index c9e7ada22d..ad37976dd4 100644
--- a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext libxrender startup-notification expat matchbox-common gconf"
+DEPENDS = "libmatchbox libx11 libxext libxrender startup-notification expat matchbox-common gconf"
 RDEPENDS = "matchbox-common"
 PV = "0.9.5+svn${SRCDATE}"
 PR = "r4"
diff --git a/openembedded/packages/pango/pango_1.10.0.bb b/openembedded/packages/pango/pango_1.10.0.bb
index dda4df2fda..869b146d56 100644
--- a/openembedded/packages/pango/pango_1.10.0.bb
+++ b/openembedded/packages/pango/pango_1.10.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
 # Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/openembedded/packages/pango/pango_1.12.0.bb b/openembedded/packages/pango/pango_1.12.0.bb
index 4b6459e034..e06e659b7b 100644
--- a/openembedded/packages/pango/pango_1.12.0.bb
+++ b/openembedded/packages/pango/pango_1.12.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
 # Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/openembedded/packages/pango/pango_1.9.1.bb b/openembedded/packages/pango/pango_1.9.1.bb
index e66b65f367..db01079fe1 100644
--- a/openembedded/packages/pango/pango_1.9.1.bb
+++ b/openembedded/packages/pango/pango_1.9.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
 # Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 2f3f56c2cc..b224bb0c9d 100644
--- a/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
+DEPENDS = "libx11 libxt libxft"