Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.

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

58 files changed, 0 insertions, 1081 deletions

diff --git a/meta/packages/xlibs/diet-x11_6.2.1.bb b/meta/packages/xlibs/diet-x11_6.2.1.bb
deleted file mode 100644
index 284fcc21c..000000000
--- a/meta/packages/xlibs/diet-x11_6.2.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTION = "x11/base"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-include libx11_${PV}.bb
-
-EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
-
-SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
-
-
diff --git a/meta/packages/xlibs/libice/autofoo.patch b/meta/packages/xlibs/libice/autofoo.patch
deleted file mode 100644
index 8ab0585fb..000000000
--- a/meta/packages/xlibs/libice/autofoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libICE-6.3.3/configure.ac~autofoo	2004-05-11 01:50:07.000000000 -0400
-+++ libICE-6.3.3/configure.ac	2005-01-18 02:30:07.463895544 -0500
-@@ -8,12 +8,12 @@
-         libICE)
- 
- AC_CONFIG_SRCDIR([Makefile.am])
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- 
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER([config.h])
--AC_CONFIG_AUX_DIR(.)
- 
- # Checks for programs.
- AC_PROG_LIBTOOL
diff --git a/meta/packages/xlibs/libice_6.3.3.bb b/meta/packages/xlibs/libice_6.3.3.bb
deleted file mode 100644
index 131114533..000000000
--- a/meta/packages/xlibs/libice_6.3.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "libs"
-LICENSE= "MIT"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11"
-PROVIDES = "ice"
-DESCRIPTION = "X11 ICE library"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libICE-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libsm/autofoo.patch b/meta/packages/xlibs/libsm/autofoo.patch
deleted file mode 100644
index 8cb204a66..000000000
--- a/meta/packages/xlibs/libsm/autofoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libSM-6.0.3/configure.ac~autofoo	2004-05-11 01:51:21.000000000 -0400
-+++ libSM-6.0.3/configure.ac	2005-01-18 12:15:50.405356376 -0500
-@@ -8,12 +8,12 @@
-         libSM)
- 
- AC_CONFIG_SRCDIR([Makefile.am])
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- 
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER([config.h])
--AC_CONFIG_AUX_DIR(.)
- 
- # Checks for programs.
- AC_PROG_LIBTOOL
diff --git a/meta/packages/xlibs/libsm_6.0.3.bb b/meta/packages/xlibs/libsm_6.0.3.bb
deleted file mode 100644
index 08f959704..000000000
--- a/meta/packages/xlibs/libsm_6.0.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "libs"
-LICENSE = "MIT-X"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11 libice"
-DESCRIPTION = "Session management library"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libSM-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libSM-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libx11-native_6.2.1.bb b/meta/packages/xlibs/libx11-native_6.2.1.bb
deleted file mode 100644
index 9513c4237..000000000
--- a/meta/packages/xlibs/libx11-native_6.2.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "x11/base"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-include libx11_${PV}.bb
-inherit native
-DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
-PROVIDES = ""
diff --git a/meta/packages/xlibs/libx11/autofoo.patch b/meta/packages/xlibs/libx11/autofoo.patch
deleted file mode 100644
index 8bdba0976..000000000
--- a/meta/packages/xlibs/libx11/autofoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libX11-6.2.1/configure.ac~autofoo
-+++ libX11-6.2.1/configure.ac
-@@ -7,12 +7,12 @@
-         [jg@freedesktop.org],
-         libX11)
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_INIT_AUTOMAKE([dist-bzip2])
-+AC_CONFIG_AUX_DIR(.)
- 
-+AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER([src/config.h])
--AC_CONFIG_AUX_DIR(.)
- 
- # Checks for programs.
- AC_PROG_LIBTOOL
diff --git a/meta/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch b/meta/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch
deleted file mode 100644
index f43d38065..000000000
--- a/meta/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- X11/src/ErrDes.c.orig	2005-09-03 16:15:48 +0200
-+++ X11/src/ErrDes.c	2005-09-03 16:16:03 +0200
-@@ -56,7 +56,7 @@
- #include <stdio.h>
- 
- #ifndef ERRORDB
--#define ERRORDB "/usr/lib/X11/XErrorDB"
-+#define ERRORDB "/usr/share/X11/XErrorDB"
- #endif
- 
- /*
---- X11/src/StrKeysym.c.orig	2005-09-03 16:41:18 +0200
-+++ X11/src/StrKeysym.c	2005-09-03 16:41:33 +0200
-@@ -36,7 +36,7 @@
- #include "Key.h"
- 
- #ifndef KEYSYMDB
--#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
-+#define KEYSYMDB "/usr/share/X11/XKeysymDB"
- #endif
- 
- static Bool initialized;
diff --git a/meta/packages/xlibs/libx11/fix-utf8-wrong-define.patch b/meta/packages/xlibs/libx11/fix-utf8-wrong-define.patch
deleted file mode 100644
index dca88fba9..000000000
--- a/meta/packages/xlibs/libx11/fix-utf8-wrong-define.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define
-+++ libX11-6.2.1/include/X11/Xlib.h
-@@ -100,7 +100,7 @@
- 
- /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
-    November 2000. Its presence is indicated through the following macro. */
--#define X_HAVE_UTF8_STRING 1
-+#undef X_HAVE_UTF8_STRING 
- 
- typedef char *XPointer;
- 
diff --git a/meta/packages/xlibs/libx11_6.2.1.bb b/meta/packages/xlibs/libx11_6.2.1.bb
deleted file mode 100644
index 901746baf..000000000
--- a/meta/packages/xlibs/libx11_6.2.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "XFree86"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
-PROVIDES = "x11"
-DESCRIPTION = "Base X libs."
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
-FILES_${PN}-locale += "${datadir}/X11/locale"
-PR = "r4"
-
-SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
-           file://errordb-keysymdb-path-fix.patch;patch=1 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libX11-${PV}"
-
-inherit autotools pkgconfig 
-
-do_compile() {
-	(
-		unset CC LD CXX CCLD
-#		unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-		oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
-	)
-	oe_runmake
-}
-
-do_stage() {
-	install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
-	install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
-	install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
-	install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
-	install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
-	install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
-	install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
-	install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
-	install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
-
-	oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
-}
diff --git a/meta/packages/xlibs/libxau-native_0.1.1.bb b/meta/packages/xlibs/libxau-native_0.1.1.bb
deleted file mode 100644
index ecb71ce3d..000000000
--- a/meta/packages/xlibs/libxau-native_0.1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "x11/base"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-include libxau_${PV}.bb
-inherit native
-DEPENDS = "xproto-native"
-PROVIDES = ""
diff --git a/meta/packages/xlibs/libxau-native_cvs.bb b/meta/packages/xlibs/libxau-native_cvs.bb
deleted file mode 100644
index cd070033c..000000000
--- a/meta/packages/xlibs/libxau-native_cvs.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "x11/base"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-include libxau_cvs.bb
-inherit native
-DEPENDS = "xproto-native"
-PROVIDES = ""
diff --git a/meta/packages/xlibs/libxau/autofoo.patch b/meta/packages/xlibs/libxau/autofoo.patch
deleted file mode 100644
index 1e42eb974..000000000
--- a/meta/packages/xlibs/libxau/autofoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libXau-0.1.1/configure.ac~autofoo
-+++ libXau-0.1.1/configure.ac
-@@ -25,11 +25,10 @@
- 
- AC_PREREQ([2.57])
- AC_INIT(libXau, [0.1.1], [keithp@keithp.com],libXau)
--AM_INIT_AUTOMAKE([dist-bzip2])
--AM_MAINTAINER_MODE
--
- AM_CONFIG_HEADER(config.h)
- AC_CONFIG_AUX_DIR(.)
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
- 
- AC_PROG_CC
- AC_PROG_INSTALL
diff --git a/meta/packages/xlibs/libxau_0.1.1.bb b/meta/packages/xlibs/libxau_0.1.1.bb
deleted file mode 100644
index dc1a28171..000000000
--- a/meta/packages/xlibs/libxau_0.1.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "MIT"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto"
-PROVIDES = "xau"
-DESCRIPTION = "Authorization Protocol for X."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXau-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxau_cvs.bb b/meta/packages/xlibs/libxau_cvs.bb
deleted file mode 100644
index 518744816..000000000
--- a/meta/packages/xlibs/libxau_cvs.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "MIT"
-PR = "r1"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto"
-PROVIDES = "xau"
-DESCRIPTION = "Authorization Protocol for X."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau"
-S = "${WORKDIR}/Xau"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxcomposite-1.0.1/autofoo.patch b/meta/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
deleted file mode 100644
index 072cf2521..000000000
--- a/meta/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: libXcomposite-1.0.1/configure.ac
-===================================================================
---- libXcomposite-1.0.1.orig/configure.ac	2004-01-15 03:59:12.000000000 -0500
-+++ libXcomposite-1.0.1/configure.ac	2005-01-18 17:05:25.573929256 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXcomposite, 1.0.1, [keithp@keithp.com], libXcomposite)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- # Check for progs
- AC_PROG_CC
diff --git a/meta/packages/xlibs/libxcomposite_1.0.1.bb b/meta/packages/xlibs/libxcomposite_1.0.1.bb
deleted file mode 100644
index e2ca3bbc7..000000000
--- a/meta/packages/xlibs/libxcomposite_1.0.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DEPENDS = "libx11 compositeext xextensions libxfixes"
-PROVIDES = "xcomposite"
-DESCRIPTION = "X Composite extension library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXcomposite-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxcomposite_cvs.bb b/meta/packages/xlibs/libxcomposite_cvs.bb
deleted file mode 100644
index 1d8b69c8c..000000000
--- a/meta/packages/xlibs/libxcomposite_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "libx11 compositeext xextensions libxfixes"
-PROVIDES = "xcomposite"
-DESCRIPTION = "X Composite extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite"
-S = "${WORKDIR}/Xcomposite"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxcursor-1.1.2/autofoo.patch b/meta/packages/xlibs/libxcursor-1.1.2/autofoo.patch
deleted file mode 100644
index 99cd45a7e..000000000
--- a/meta/packages/xlibs/libxcursor-1.1.2/autofoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXcursor-1.1.2/configure.ac~autofoo	2004-01-16 23:38:26.000000000 -0500
-+++ libXcursor-1.1.2/configure.ac	2005-01-18 13:40:06.539707120 -0500
-@@ -31,11 +31,11 @@
- dnl not possible to extract the version number here from Xcursor.h
- dnl
- AC_INIT([libXcursor],1.1.2,[keithp@keithp.com],[libXcursor])
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_MAINTAINER_MODE
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- dnl libtool versioning
- 
diff --git a/meta/packages/xlibs/libxcursor/autofoo.patch b/meta/packages/xlibs/libxcursor/autofoo.patch
deleted file mode 100644
index 7aa573ce1..000000000
--- a/meta/packages/xlibs/libxcursor/autofoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
-Index: Xcursor/configure.ac
-===================================================================
---- Xcursor.orig/configure.ac	2004-04-12 10:11:12.000000000 -0400
-+++ Xcursor/configure.ac	2005-01-18 16:04:36.860617992 -0500
-@@ -31,11 +31,11 @@
- dnl not possible to extract the version number here from Xcursor.h
- dnl
- AC_INIT([libXcursor],1.1.3,[keithp@keithp.com],[libXcursor])
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_MAINTAINER_MODE
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- dnl libtool versioning
- 
diff --git a/meta/packages/xlibs/libxcursor_1.1.2.bb b/meta/packages/xlibs/libxcursor_1.1.2.bb
deleted file mode 100644
index 25744c7dc..000000000
--- a/meta/packages/xlibs/libxcursor_1.1.2.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DESCRIPTION = "X Cursor library"
-DEPENDS = "libxfixes"
-PR = "r2"
-
-SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXcursor-${PV}"
-FILES_${PN} += "${libdir}/libXcursor.so"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxdamage-1.0.1/autofoo.patch b/meta/packages/xlibs/libxdamage-1.0.1/autofoo.patch
deleted file mode 100644
index 1e3ec45d4..000000000
--- a/meta/packages/xlibs/libxdamage-1.0.1/autofoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: libXdamage-1.0.1/configure.ac
-===================================================================
---- libXdamage-1.0.1.orig/configure.ac	2004-01-15 03:54:55.000000000 -0500
-+++ libXdamage-1.0.1/configure.ac	2005-01-18 19:07:16.951430928 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- # Check for progs
- AC_PROG_CC
diff --git a/meta/packages/xlibs/libxdamage/m4.patch b/meta/packages/xlibs/libxdamage/m4.patch
deleted file mode 100644
index 393f3d13d..000000000
--- a/meta/packages/xlibs/libxdamage/m4.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null
-+++ Xdamage/m4/pkg.m4
-@@ -0,0 +1,57 @@
-+
-+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-+dnl also defines GSTUFF_PKG_ERRORS on error
-+AC_DEFUN(PKG_CHECK_MODULES, [
-+  succeeded=no
-+
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     PKG_CONFIG_MIN_VERSION=0.9.0
-+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+        AC_MSG_CHECKING(for $2)
-+
-+        if $PKG_CONFIG --exists "$2" ; then
-+            AC_MSG_RESULT(yes)
-+            succeeded=yes
-+
-+            AC_MSG_CHECKING($1_CFLAGS)
-+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-+            AC_MSG_RESULT($$1_CFLAGS)
-+
-+            AC_MSG_CHECKING($1_LIBS)
-+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-+            AC_MSG_RESULT($$1_LIBS)
-+        else
-+            $1_CFLAGS=""
-+            $1_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but 
-+            ## do set a variable so people can do so.
-+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-+        fi
-+
-+        AC_SUBST($1_CFLAGS)
-+        AC_SUBST($1_LIBS)
-+     else
-+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+     fi
-+  fi
-+
-+  if test $succeeded = yes; then
-+     ifelse([$3], , :, [$3])
-+  else
-+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-+  fi
-+])
-+
-+
diff --git a/meta/packages/xlibs/libxdamage_1.0.1.bb b/meta/packages/xlibs/libxdamage_1.0.1.bb
deleted file mode 100644
index 040e86344..000000000
--- a/meta/packages/xlibs/libxdamage_1.0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DEPENDS = "libx11 damageext libxfixes xproto"
-PROVIDES = "xdamage"
-DESCRIPTION = "X Damage extension library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \
-	   file://m4.patch;patch=1 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXdamage-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxdamage_cvs.bb b/meta/packages/xlibs/libxdamage_cvs.bb
deleted file mode 100644
index ba8a68033..000000000
--- a/meta/packages/xlibs/libxdamage_cvs.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "libx11 damageext libxfixes xproto"
-PROVIDES = "xdamage"
-DESCRIPTION = "X Damage extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \
-	   file://m4.patch;patch=1"
-S = "${WORKDIR}/Xdamage"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxdmcp-native_0.1.3.bb b/meta/packages/xlibs/libxdmcp-native_0.1.3.bb
deleted file mode 100644
index 8d7162b35..000000000
--- a/meta/packages/xlibs/libxdmcp-native_0.1.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "x11/libs"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp"
-include libxdmcp_${PV}.bb
-inherit native
-DEPENDS = "xproto-native"
-PROVIDES = ""
diff --git a/meta/packages/xlibs/libxdmcp/autofoo.patch b/meta/packages/xlibs/libxdmcp/autofoo.patch
deleted file mode 100644
index ff1a76ad0..000000000
--- a/meta/packages/xlibs/libxdmcp/autofoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libXdmcp-0.1.3/configure.ac~autofoo
-+++ libXdmcp-0.1.3/configure.ac
-@@ -25,12 +25,11 @@
- 
- AC_PREREQ([2.57])
- AC_INIT(libXdmcp, [0.1.3], [keithp@keithp.com],libXdmcp)
-+AC_CONFIG_AUX_DIR(.)
-+AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h])
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
--
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
--AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h])
- 
- AC_PROG_CC
- AC_PROG_INSTALL
diff --git a/meta/packages/xlibs/libxdmcp_0.1.3.bb b/meta/packages/xlibs/libxdmcp_0.1.3.bb
deleted file mode 100644
index aa2736cdb..000000000
--- a/meta/packages/xlibs/libxdmcp_0.1.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE= "MIT"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto"
-PROVIDES = "xdmcp"
-DESCRIPTION = "X Display Manager Control Protocol library."
-PR = "r1"
-S = "${WORKDIR}/libXdmcp-${PV}"
-
-SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxext-native_cvs.bb b/meta/packages/xlibs/libxext-native_cvs.bb
deleted file mode 100644
index 9294b080b..000000000
--- a/meta/packages/xlibs/libxext-native_cvs.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "unknown"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext"
-include libxext_${PV}.bb
-inherit native
-DEPENDS = "libx11-native xextensions-native"
-PROVIDES = ""
diff --git a/meta/packages/xlibs/libxext/autofoo.patch b/meta/packages/xlibs/libxext/autofoo.patch
deleted file mode 100644
index c00688452..000000000
--- a/meta/packages/xlibs/libxext/autofoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- Xext/configure.ac~autofoo
-+++ Xext/configure.ac
-@@ -8,9 +8,8 @@
-         libXext)
- 
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_INIT_AUTOMAKE([dist-bzip2])
--
- AC_CONFIG_AUX_DIR(.)
-+AM_INIT_AUTOMAKE([dist-bzip2])
- 
- AM_MAINTAINER_MODE
- 
diff --git a/meta/packages/xlibs/libxext_cvs.bb b/meta/packages/xlibs/libxext_cvs.bb
deleted file mode 100644
index 0ef675ca7..000000000
--- a/meta/packages/xlibs/libxext_cvs.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-PR = "r1"
-LICENSE= "MIT"
-DESCRIPTION = "X Server Extension library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "xproto libx11 xextensions"
-PROVIDES = "xext"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
-S = "${WORKDIR}/Xext"
-
-inherit autotools pkgconfig 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxfixes/autofoo.patch b/meta/packages/xlibs/libxfixes/autofoo.patch
deleted file mode 100644
index 26803cf7f..000000000
--- a/meta/packages/xlibs/libxfixes/autofoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXfixes-2.0.1/configure.ac~autofoo	2004-01-15 03:40:23.000000000 -0500
-+++ libXfixes-2.0.1/configure.ac	2005-01-18 13:35:33.461221360 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXfixes, 2.0.1, [keithp@keithp.com], libXfixes)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- # Check for progs
- AC_PROG_CC
diff --git a/meta/packages/xlibs/libxfixes_2.0.1.bb b/meta/packages/xlibs/libxfixes_2.0.1.bb
deleted file mode 100644
index 710fa1745..000000000
--- a/meta/packages/xlibs/libxfixes_2.0.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DEPENDS = "libx11 fixesext"
-DESCRIPTION = "X Fixes extension library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXfixes-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxfixes_cvs.bb b/meta/packages/xlibs/libxfixes_cvs.bb
deleted file mode 100644
index 4494dc932..000000000
--- a/meta/packages/xlibs/libxfixes_cvs.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "libx11 fixesext"
-DESCRIPTION = "X Fixes extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes"
-S = "${WORKDIR}/Xfixes"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxfont/autofoo.patch b/meta/packages/xlibs/libxfont/autofoo.patch
deleted file mode 100644
index 4998625c2..000000000
--- a/meta/packages/xlibs/libxfont/autofoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXfont-1.4.2/configure.ac~autofoo	2004-05-06 20:19:03.000000000 -0400
-+++ libXfont-1.4.2/configure.ac	2005-01-16 12:14:14.042598720 -0500
-@@ -35,9 +35,9 @@
- dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
- dnl not possible to extract the version number here from Xfont.h
- dnl
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
- 
- # Check for progs
diff --git a/meta/packages/xlibs/libxfont/scalable.patch b/meta/packages/xlibs/libxfont/scalable.patch
deleted file mode 100644
index 7f97b9a8f..000000000
--- a/meta/packages/xlibs/libxfont/scalable.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: fontfile/fontdir.c
-===================================================================
-RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v
-retrieving revision 3.22
-diff -u -r3.22 fontdir.c
---- xfont/fontfile/fontdir.c	7 Jul 2003 16:40:11 -0000	3.22
-+++ xfont/fontfile/fontdir.c	30 Dec 2004 20:37:12 -0000
-@@ -699,6 +699,11 @@
-      */
-     if (isscale)
-     {
-+      /* If the fontname says it is scalable, make sure that the
-+       * renderer supports OpenScalable and GetInfoScalable.
-+       */
-+      if (renderer->OpenScalable && renderer->GetInfoScalable)
-+      {
- 	if (vals.values_supplied & SIZE_SPECIFY_MASK)
- 	{
- 	    bzero((char *)&zeroVals, sizeof(zeroVals));
-@@ -798,6 +803,7 @@
-                                            bitmap->name.name);
-             }
- 	}
-+      }
-     }
-     return TRUE;
- }
diff --git a/meta/packages/xlibs/libxfont_1.4.2.bb b/meta/packages/xlibs/libxfont_1.4.2.bb
deleted file mode 100644
index 0cc45397f..000000000
--- a/meta/packages/xlibs/libxfont_1.4.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto xtrans zlib"
-PROVIDES = "xfont"
-DESCRIPTION = "X font library (used by the X server)."
-PR = "r2"
-
-SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \
-	file://scalable.patch;patch=1 \
-	file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXfont-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxfont_cvs.bb b/meta/packages/xlibs/libxfont_cvs.bb
deleted file mode 100644
index bd21e0fd1..000000000
--- a/meta/packages/xlibs/libxfont_cvs.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "BSD-X"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto xtrans zlib"
-PROVIDES = "xfont"
-DESCRIPTION = "X font library (used by the X server)."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \
-	file://scalable.patch;patch=1"
-S = "${WORKDIR}/Xfont"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxft/autofoo.patch b/meta/packages/xlibs/libxft/autofoo.patch
deleted file mode 100644
index 54120aa61..000000000
--- a/meta/packages/xlibs/libxft/autofoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXft-2.1.6/configure.ac~autofoo	2004-03-22 10:02:59.000000000 -0500
-+++ libXft-2.1.6/configure.ac	2005-01-17 02:08:10.165951760 -0500
-@@ -33,12 +33,12 @@
- dnl Please bump the minor library number at each release as well.
- dnl
- AC_INIT(libXft, 2.1.6, [keithp@keithp.com], libXft)
-+AC_CONFIG_AUX_DIR(.)
- 
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- # checks for progs
- AC_PROG_CC
diff --git a/meta/packages/xlibs/libxft_2.1.6.bb b/meta/packages/xlibs/libxft_2.1.6.bb
deleted file mode 100644
index c3f1f74e4..000000000
--- a/meta/packages/xlibs/libxft_2.1.6.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-DEPENDS = "libx11 xproto libxrender freetype fontconfig"
-DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
-PROVIDES = "xft"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXft-${PV}"
-
-FILES_${PN} = ${libdir}/lib*.so.*
-FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
-		${libdir}/*.a ${libdir}/pkgconfig \
-		${datadir}/aclocal ${bindir} ${sbindir}
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
-
-python do_package() {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', 'libxft2', d)
-        bb.build.exec_func('package_do_package', d)
-}
diff --git a/meta/packages/xlibs/libxft_cvs.bb b/meta/packages/xlibs/libxft_cvs.bb
deleted file mode 100644
index 6c1a5f5c3..000000000
--- a/meta/packages/xlibs/libxft_cvs.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "x11/libs"
-DEPENDS = "libx11 xproto libxrender freetype fontconfig"
-DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
-PROVIDES = "xft"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xft"
-S = "${WORKDIR}/Xft"
-
-FILES_${PN} = ${libdir}/lib*.so.*
-FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
-		${libdir}/*.a ${libdir}/pkgconfig \
-		${datadir}/aclocal ${bindir} ${sbindir}
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
-
-python do_package() {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', 'libxft2', d)
-        bb.build.exec_func('package_do_package', d)
-}
diff --git a/meta/packages/xlibs/libxi/autofoo.patch b/meta/packages/xlibs/libxi/autofoo.patch
deleted file mode 100644
index f1bce9ed7..000000000
--- a/meta/packages/xlibs/libxi/autofoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libXi-6.0.1/configure.ac
-===================================================================
---- libXi-6.0.1.orig/configure.ac	2003-11-01 04:11:49.000000000 -0500
-+++ libXi-6.0.1/configure.ac	2005-01-20 11:34:06.878357352 -0500
-@@ -8,7 +8,6 @@
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER([config.h])
--AC_CONFIG_AUX_DIR(.)
- 
- # Checks for programs.
- AC_PROG_LIBTOOL
diff --git a/meta/packages/xlibs/libxi_6.0.1.bb b/meta/packages/xlibs/libxi_6.0.1.bb
deleted file mode 100644
index 5c44d06df..000000000
--- a/meta/packages/xlibs/libxi_6.0.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "X Input Extension library"
-LICENSE = "MIT-X"
-SECTION = "x11/libs"
-DEPENDS = "xproto libx11 xextensions"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXi-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
-
diff --git a/meta/packages/xlibs/libxmu_cvs.bb b/meta/packages/xlibs/libxmu_cvs.bb
deleted file mode 100644
index 500b373c3..000000000
--- a/meta/packages/xlibs/libxmu_cvs.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "libxt libxext"
-PROVIDES = "xmu"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu"
-S = "${WORKDIR}/Xmu"
-
-PACKAGES =+ "xmuu xmuu-dev"
-
-FILES_xmuu = "${libdir}/libXmuu.so.*"
-FILES_xmuu-dev = "${libdir}/libXmuu.so"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxpm/autofoo.patch b/meta/packages/xlibs/libxpm/autofoo.patch
deleted file mode 100644
index 6b2174bf0..000000000
--- a/meta/packages/xlibs/libxpm/autofoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: libXpm-3.5.1/configure.ac
-===================================================================
---- libXpm-3.5.1.orig/configure.ac	2004-05-11 02:00:35.000000000 -0400
-+++ libXpm-3.5.1/configure.ac	2005-01-19 18:35:57.187402008 -0500
-@@ -1,12 +1,12 @@
- AC_PREREQ(2.57)
- AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm)
- AC_CONFIG_SRCDIR([Makefile.am])
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- 
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER([lib/config.h])
--AC_CONFIG_AUX_DIR(.)
- 
- # Checks for programs.
- AC_PROG_LIBTOOL
diff --git a/meta/packages/xlibs/libxpm_3.5.1.bb b/meta/packages/xlibs/libxpm_3.5.1.bb
deleted file mode 100644
index 513261efd..000000000
--- a/meta/packages/xlibs/libxpm_3.5.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "X-BSD"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto libx11"
-PROVIDES = "xpm"
-DESCRIPTION = "X Pixmap library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXpm-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXpm-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
-	oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
-}
diff --git a/meta/packages/xlibs/libxpm_cvs.bb b/meta/packages/xlibs/libxpm_cvs.bb
deleted file mode 100644
index 1b4685573..000000000
--- a/meta/packages/xlibs/libxpm_cvs.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "X-BSD"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto libx11"
-PROVIDES = "xpm"
-DESCRIPTION = "X Pixmap library."
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xpm"
-S = "${WORKDIR}/Xpm"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
-	oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
-}
diff --git a/meta/packages/xlibs/libxrandr-1.0.2/autofoo.patch b/meta/packages/xlibs/libxrandr-1.0.2/autofoo.patch
deleted file mode 100644
index 21f6e7fd7..000000000
--- a/meta/packages/xlibs/libxrandr-1.0.2/autofoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXrandr-1.0.2/configure.ac~autofoo	2004-01-15 03:23:00.000000000 -0500
-+++ libXrandr-1.0.2/configure.ac	2005-01-16 11:18:35.924069872 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- # Check for progs
- AC_PROG_CC
diff --git a/meta/packages/xlibs/libxrandr/autofoo.patch b/meta/packages/xlibs/libxrandr/autofoo.patch
deleted file mode 100644
index 7b1db760f..000000000
--- a/meta/packages/xlibs/libxrandr/autofoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- Xrandr/configure.ac~autofoo.patch	2004-07-01 15:01:55.000000000 -0400
-+++ Xrandr/configure.ac	2005-01-16 11:22:09.169651616 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- # Check for progs
- AC_PROG_CC
---- Xrandr/ChangeLog~autofoo.patch	2004-09-19 04:53:38.000000000 -0400
-+++ Xrandr/ChangeLog	2005-01-16 11:52:29.694889712 -0500
-@@ -1,3 +1,7 @@
-+2005-01-16  Chris Larson <kergoth@handhelds.org>
-+
-+	* configure.ac: Fix to work with automake 1.9.x.
-+
- 2004-09-19  Carlos Romero  <kidcrash@freedesktop.org>
- 
- 	* Makefile.am:
diff --git a/meta/packages/xlibs/libxrandr_1.0.2.bb b/meta/packages/xlibs/libxrandr_1.0.2.bb
deleted file mode 100644
index efd050554..000000000
--- a/meta/packages/xlibs/libxrandr_1.0.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "BSD-X"
-DEPENDS = "randrext libx11 libxrender libxext"
-DESCRIPTION = "X Resize and Rotate extension library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXrandr-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXrandr-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxrender/autofoo.patch b/meta/packages/xlibs/libxrender/autofoo.patch
deleted file mode 100644
index eb21c766f..000000000
--- a/meta/packages/xlibs/libxrender/autofoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libXrender-0.8.4/configure.ac~autofoo
-+++ libXrender-0.8.4/configure.ac
-@@ -33,11 +33,10 @@
- dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXrender, 0.8.4, [keithp@keithp.com], libXrender)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
--
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- # Check for progs
- AC_PROG_CC
diff --git a/meta/packages/xlibs/libxrender_cvs.bb b/meta/packages/xlibs/libxrender_cvs.bb
deleted file mode 100644
index ea6b1f460..000000000
--- a/meta/packages/xlibs/libxrender_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-PR = "r1"
-SECTION = "libs"
-DEPENDS = "renderext libx11"
-DESCRIPTION = "X Render extension library."
-LICENSE = "BSD"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrender"
-S = "${WORKDIR}/Xrender"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxt/autofoo.patch b/meta/packages/xlibs/libxt/autofoo.patch
deleted file mode 100644
index ff6dfdbbc..000000000
--- a/meta/packages/xlibs/libxt/autofoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXt-0.1.5/configure.ac~autofoo	2004-05-06 20:19:04.000000000 -0400
-+++ libXt-0.1.5/configure.ac	2005-01-18 13:10:13.683262728 -0500
-@@ -28,11 +28,11 @@
- dnl
- dnl
- AC_INIT(libXt, 0.1.5, [keithp@keithp.com], libXt)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- 
- # Check for progs
- AC_PROG_CC
diff --git a/meta/packages/xlibs/libxt_0.1.5.bb b/meta/packages/xlibs/libxt_0.1.5.bb
deleted file mode 100644
index 00cbe9a3a..000000000
--- a/meta/packages/xlibs/libxt_0.1.5.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11 libsm"
-PROVIDES = "xt"
-DESCRIPTION = "X Toolkit Intrinsics"
-LICENSE = "X-MIT"
-PR = "r1"
-SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXt-${PV}"
-
-PARALLEL_MAKE = ""
-
-inherit autotools pkgconfig 
-
-#nasty hack as utils need to be native
-do_compile() {
-        (
-                unset CC LD CXX CCLD
-#               unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-                oe_runmake -C util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
-        )
-        oe_runmake
-}
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/libxtst_cvs.bb b/meta/packages/xlibs/libxtst_cvs.bb
deleted file mode 100644
index c7c24d5d7..000000000
--- a/meta/packages/xlibs/libxtst_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "GPL"
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "libx11 recordext libxext"
-PROVIDES = "xtst"
-DESCRIPTION = "X Test Extension: client side library"
-PR = "r3"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xtst"
-S = "${WORKDIR}/Xtst"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/xtrans-native_0.1.bb b/meta/packages/xlibs/xtrans-native_0.1.bb
deleted file mode 100644
index 80de95c86..000000000
--- a/meta/packages/xlibs/xtrans-native_0.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-SECTION = "x11/base"
-include xtrans_${PV}.bb
-inherit native
diff --git a/meta/packages/xlibs/xtrans_0.1.bb b/meta/packages/xlibs/xtrans_0.1.bb
deleted file mode 100644
index 8fee0d508..000000000
--- a/meta/packages/xlibs/xtrans_0.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "MIT"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DESCRIPTION = "network API translation layer to \
-insulate X applications and libraries from OS \
-network vageries."
-
-SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2"
-S = "${WORKDIR}/libXtrans-${PV}"
-
-inherit autotools  pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xlibs/xtrans_cvs.bb b/meta/packages/xlibs/xtrans_cvs.bb
deleted file mode 100644
index 9714f4017..000000000
--- a/meta/packages/xlibs/xtrans_cvs.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DESCRIPTION = "network API translation layer to \
-insulate X applications and libraries from OS \
-network vageries."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xtrans"
-S = "${WORKDIR}/xtrans"
-
-inherit autotools  pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}