From e3fdd33b3eecaad2f4f321970b8ba945bb41efac Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sun, 29 Oct 2006 11:03:14 +0000
Subject: Drop old xlib versions (pre X11R7)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@837 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-lib/diet-x11_20050226.bb        |  6 ----
 meta/packages/xorg-lib/diet-x11_6.2.1.bb           |  9 -----
 meta/packages/xorg-lib/diet-x11_cvs.bb             |  7 ----
 meta/packages/xorg-lib/libice_6.3.3.bb             | 17 ---------
 meta/packages/xorg-lib/libice_cvs.bb               | 17 ---------
 meta/packages/xorg-lib/libsm_6.0.3.bb              | 16 ---------
 meta/packages/xorg-lib/libsm_cvs.bb                | 18 ----------
 meta/packages/xorg-lib/libx11-native_cvs.bb        |  5 ---
 meta/packages/xorg-lib/libx11_20050226.bb          |  6 ----
 meta/packages/xorg-lib/libx11_6.2.1.bb             | 40 ---------------------
 meta/packages/xorg-lib/libx11_cvs.bb               | 41 ----------------------
 meta/packages/xorg-lib/libxau-native_0.1.1.bb      |  6 ----
 meta/packages/xorg-lib/libxau-native_cvs.bb        |  6 ----
 meta/packages/xorg-lib/libxau_0.1.1.bb             | 17 ---------
 meta/packages/xorg-lib/libxau_cvs.bb               | 17 ---------
 meta/packages/xorg-lib/libxaw_7.0.2.bb             | 20 -----------
 meta/packages/xorg-lib/libxaw_cvs.bb               | 19 ----------
 meta/packages/xorg-lib/libxcomposite_1.0.1.bb      | 16 ---------
 meta/packages/xorg-lib/libxcomposite_cvs.bb        | 15 --------
 meta/packages/xorg-lib/libxcursor_1.1.2.bb         | 17 ---------
 meta/packages/xorg-lib/libxcursor_cvs.bb           | 17 ---------
 meta/packages/xorg-lib/libxdamage_1.0.1.bb         | 17 ---------
 meta/packages/xorg-lib/libxdamage_cvs.bb           | 16 ---------
 meta/packages/xorg-lib/libxdmcp_0.1.1.bb           | 17 ---------
 meta/packages/xorg-lib/libxdmcp_0.1.3.bb           | 17 ---------
 meta/packages/xorg-lib/libxdmcp_cvs.bb             | 17 ---------
 meta/packages/xorg-lib/libxext-native_cvs.bb       |  6 ----
 meta/packages/xorg-lib/libxext_cvs.bb              | 16 ---------
 meta/packages/xorg-lib/libxfixes_2.0.1.bb          | 15 --------
 meta/packages/xorg-lib/libxfixes_cvs.bb            | 14 --------
 meta/packages/xorg-lib/libxfont_1.4.2.bb           | 18 ----------
 meta/packages/xorg-lib/libxfont_cvs.bb             | 17 ---------
 meta/packages/xorg-lib/libxft_2.1.6.bb             | 27 --------------
 meta/packages/xorg-lib/libxft_cvs.bb               | 26 --------------
 meta/packages/xorg-lib/libxi_6.0.1.bb              | 16 ---------
 meta/packages/xorg-lib/libxi_cvs.bb                | 16 ---------
 .../xorg-lib/libxinerama_1.0.2+cvs20050505.bb      | 15 --------
 meta/packages/xorg-lib/libxinerama_1.0.2.bb        | 16 ---------
 meta/packages/xorg-lib/libxinerama_cvs.bb          | 16 ---------
 meta/packages/xorg-lib/libxkbfile_cvs.bb           | 15 --------
 meta/packages/xorg-lib/libxmu_cvs.bb               | 21 -----------
 meta/packages/xorg-lib/libxp_cvs.bb                | 18 ----------
 meta/packages/xorg-lib/libxpm_3.5.1.bb             | 18 ----------
 meta/packages/xorg-lib/libxpm_cvs.bb               | 18 ----------
 meta/packages/xorg-lib/libxrandr_1.0.2.bb          | 15 --------
 meta/packages/xorg-lib/libxrandr_cvs.bb            | 15 --------
 meta/packages/xorg-lib/libxrender_0.8.4.bb         | 15 --------
 meta/packages/xorg-lib/libxrender_cvs.bb           | 15 --------
 meta/packages/xorg-lib/libxres_1.0.1.bb            | 13 -------
 meta/packages/xorg-lib/libxres_cvs.bb              | 14 --------
 meta/packages/xorg-lib/libxt_0.1.5.bb              | 28 ---------------
 meta/packages/xorg-lib/libxt_cvs.bb                | 26 --------------
 meta/packages/xorg-lib/libxtst_cvs.bb              | 17 ---------
 meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb  | 13 -------
 meta/packages/xorg-lib/libxv_2.2.2.bb              | 13 -------
 meta/packages/xorg-lib/libxvmc_20040919.bb         | 39 --------------------
 meta/packages/xorg-lib/libxvmc_20041025.bb         | 36 -------------------
 meta/packages/xorg-lib/libxvmc_20050612.bb         | 37 -------------------
 meta/packages/xorg-lib/libxxf86dga_cvs.bb          | 15 --------
 meta/packages/xorg-lib/libxxf86vm_cvs.bb           | 15 --------
 meta/packages/xorg-lib/xtrans-native_0.1.bb        |  3 --
 meta/packages/xorg-lib/xtrans_0.1.bb               | 14 --------
 meta/packages/xorg-lib/xtrans_cvs.bb               | 15 --------
 63 files changed, 1082 deletions(-)
 delete mode 100644 meta/packages/xorg-lib/diet-x11_20050226.bb
 delete mode 100644 meta/packages/xorg-lib/diet-x11_6.2.1.bb
 delete mode 100644 meta/packages/xorg-lib/diet-x11_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libice_6.3.3.bb
 delete mode 100644 meta/packages/xorg-lib/libice_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libsm_6.0.3.bb
 delete mode 100644 meta/packages/xorg-lib/libsm_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libx11-native_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libx11_20050226.bb
 delete mode 100644 meta/packages/xorg-lib/libx11_6.2.1.bb
 delete mode 100644 meta/packages/xorg-lib/libx11_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxau-native_0.1.1.bb
 delete mode 100644 meta/packages/xorg-lib/libxau-native_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxau_0.1.1.bb
 delete mode 100644 meta/packages/xorg-lib/libxau_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxaw_7.0.2.bb
 delete mode 100644 meta/packages/xorg-lib/libxaw_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxcomposite_1.0.1.bb
 delete mode 100644 meta/packages/xorg-lib/libxcomposite_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxcursor_1.1.2.bb
 delete mode 100644 meta/packages/xorg-lib/libxcursor_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxdamage_1.0.1.bb
 delete mode 100644 meta/packages/xorg-lib/libxdamage_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxdmcp_0.1.1.bb
 delete mode 100644 meta/packages/xorg-lib/libxdmcp_0.1.3.bb
 delete mode 100644 meta/packages/xorg-lib/libxdmcp_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxext-native_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxext_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxfixes_2.0.1.bb
 delete mode 100644 meta/packages/xorg-lib/libxfixes_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxfont_1.4.2.bb
 delete mode 100644 meta/packages/xorg-lib/libxfont_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxft_2.1.6.bb
 delete mode 100644 meta/packages/xorg-lib/libxft_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxi_6.0.1.bb
 delete mode 100644 meta/packages/xorg-lib/libxi_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
 delete mode 100644 meta/packages/xorg-lib/libxinerama_1.0.2.bb
 delete mode 100644 meta/packages/xorg-lib/libxinerama_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxkbfile_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxmu_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxp_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxpm_3.5.1.bb
 delete mode 100644 meta/packages/xorg-lib/libxpm_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxrandr_1.0.2.bb
 delete mode 100644 meta/packages/xorg-lib/libxrandr_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxrender_0.8.4.bb
 delete mode 100644 meta/packages/xorg-lib/libxrender_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxres_1.0.1.bb
 delete mode 100644 meta/packages/xorg-lib/libxres_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxt_0.1.5.bb
 delete mode 100644 meta/packages/xorg-lib/libxt_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxtst_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
 delete mode 100644 meta/packages/xorg-lib/libxv_2.2.2.bb
 delete mode 100644 meta/packages/xorg-lib/libxvmc_20040919.bb
 delete mode 100644 meta/packages/xorg-lib/libxvmc_20041025.bb
 delete mode 100644 meta/packages/xorg-lib/libxvmc_20050612.bb
 delete mode 100644 meta/packages/xorg-lib/libxxf86dga_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/libxxf86vm_cvs.bb
 delete mode 100644 meta/packages/xorg-lib/xtrans-native_0.1.bb
 delete mode 100644 meta/packages/xorg-lib/xtrans_0.1.bb
 delete mode 100644 meta/packages/xorg-lib/xtrans_cvs.bb

diff --git a/meta/packages/xorg-lib/diet-x11_20050226.bb b/meta/packages/xorg-lib/diet-x11_20050226.bb
deleted file mode 100644
index 122080605..000000000
--- a/meta/packages/xorg-lib/diet-x11_20050226.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "x11/base"
-require libx11_${PV}.bb
-
-EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
-
-SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
diff --git a/meta/packages/xorg-lib/diet-x11_6.2.1.bb b/meta/packages/xorg-lib/diet-x11_6.2.1.bb
deleted file mode 100644
index 96d63aa0e..000000000
--- a/meta/packages/xorg-lib/diet-x11_6.2.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SECTION = "x11/base"
-require 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 \
-	file://xim.patch;patch=1"
-
diff --git a/meta/packages/xorg-lib/diet-x11_cvs.bb b/meta/packages/xorg-lib/diet-x11_cvs.bb
deleted file mode 100644
index 968764b50..000000000
--- a/meta/packages/xorg-lib/diet-x11_cvs.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SECTION = "x11/base"
-require libx11_cvs.bb
-
-EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
-
-SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
-	file://xim.patch;patch=1"
diff --git a/meta/packages/xorg-lib/libice_6.3.3.bb b/meta/packages/xorg-lib/libice_6.3.3.bb
deleted file mode 100644
index 3bbea635e..000000000
--- a/meta/packages/xorg-lib/libice_6.3.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "libs"
-LICENSE= "MIT"
-PRIORITY = "optional"
-DEPENDS = "virtual/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/xorg-lib/libice_cvs.bb b/meta/packages/xorg-lib/libice_cvs.bb
deleted file mode 100644
index 1756a235d..000000000
--- a/meta/packages/xorg-lib/libice_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "MIT"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11"
-PROVIDES = "ice"
-DESCRIPTION = "X11 ICE library"
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ICE"
-S = "${WORKDIR}/ICE"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libsm_6.0.3.bb b/meta/packages/xorg-lib/libsm_6.0.3.bb
deleted file mode 100644
index 620e4d829..000000000
--- a/meta/packages/xorg-lib/libsm_6.0.3.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "libs"
-LICENSE = "MIT-X"
-PRIORITY = "optional"
-DEPENDS = "virtual/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/xorg-lib/libsm_cvs.bb b/meta/packages/xorg-lib/libsm_cvs.bb
deleted file mode 100644
index 45d6bfa23..000000000
--- a/meta/packages/xorg-lib/libsm_cvs.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "6.0.3+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libice"
-DESCRIPTION = "Session management library"
-PR = "r1"
-
-DEFAULT_PREFERENCE="-1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=SM"
-S = "${WORKDIR}/SM"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libx11-native_cvs.bb b/meta/packages/xorg-lib/libx11-native_cvs.bb
deleted file mode 100644
index c76d4dce8..000000000
--- a/meta/packages/xorg-lib/libx11-native_cvs.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "x11/base"
-require libx11_cvs.bb
-inherit native
-DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
-PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libx11_20050226.bb b/meta/packages/xorg-lib/libx11_20050226.bb
deleted file mode 100644
index 2fa9e995b..000000000
--- a/meta/packages/xorg-lib/libx11_20050226.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCDATE = "20050226"
-
-require libx11_cvs.bb
-
-DEFAULT_PREFERENCE = "0"
-
diff --git a/meta/packages/xorg-lib/libx11_6.2.1.bb b/meta/packages/xorg-lib/libx11_6.2.1.bb
deleted file mode 100644
index 4e160ad28..000000000
--- a/meta/packages/xorg-lib/libx11_6.2.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "XFree86"
-PRIORITY = "optional"
-DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
-PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
-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/xorg-lib/libx11_cvs.bb b/meta/packages/xorg-lib/libx11_cvs.bb
deleted file mode 100644
index 7b89c668d..000000000
--- a/meta/packages/xorg-lib/libx11_cvs.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-PV = "6.2.1+cvs${SRCDATE}"
-LICENSE = "XFree86"
-PR = "r6"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
-PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
-DESCRIPTION = "Base X libs."
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
-FILES_${PN}-locale += "${datadir}/X11/locale"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \
-	   file://errordb-keysymdb-path-fix.patch;patch=1"
-S = "${WORKDIR}/X11"
-
-inherit autotools pkgconfig 
-
-do_compile() {
-	(
-		unset CC LD CXX CCLD
-#		unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-		oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
-	)
-	rm -f ${STAGING_INCDIR}/X11/Xlib.h
-	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/xorg-lib/libxau-native_0.1.1.bb b/meta/packages/xorg-lib/libxau-native_0.1.1.bb
deleted file mode 100644
index f5acbee73..000000000
--- a/meta/packages/xorg-lib/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"
-require libxau_${PV}.bb
-inherit native
-DEPENDS = "xproto-native"
-PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libxau-native_cvs.bb b/meta/packages/xorg-lib/libxau-native_cvs.bb
deleted file mode 100644
index 685f849bd..000000000
--- a/meta/packages/xorg-lib/libxau-native_cvs.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "x11/base"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-require libxau_cvs.bb
-inherit native
-DEPENDS = "xproto-native"
-PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libxau_0.1.1.bb b/meta/packages/xorg-lib/libxau_0.1.1.bb
deleted file mode 100644
index ef5eb9662..000000000
--- a/meta/packages/xorg-lib/libxau_0.1.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "MIT"
-PRIORITY = "optional"
-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/xorg-lib/libxau_cvs.bb b/meta/packages/xorg-lib/libxau_cvs.bb
deleted file mode 100644
index 787bc290e..000000000
--- a/meta/packages/xorg-lib/libxau_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "MIT"
-PR = "r1"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-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/xorg-lib/libxaw_7.0.2.bb b/meta/packages/xorg-lib/libxaw_7.0.2.bb
deleted file mode 100644
index b55f2b830..000000000
--- a/meta/packages/xorg-lib/libxaw_7.0.2.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "MIT"
-PRIORITY = "optional"
-DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm"
-PROVIDES = "xaw"
-DESCRIPTION = "X Athena Widgets library"
-
-SRC_URI = "${XLIBS_MIRROR}/libXaw-${PV}.tar.bz2 \
-	   file://auxdir.patch;patch=1"
-
-S = "${WORKDIR}/libXaw-${PV}"
-
-inherit autotools pkgconfig 
-
-# FIXME: libXaw needs a full x11, not diet
-BROKEN = "1"
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxaw_cvs.bb b/meta/packages/xorg-lib/libxaw_cvs.bb
deleted file mode 100644
index 2c696ceba..000000000
--- a/meta/packages/xorg-lib/libxaw_cvs.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm"
-PROVIDES = "xaw"
-DESCRIPTION = "X Athena Widgets library"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw"
-S = "${WORKDIR}/Xaw"
-
-inherit autotools pkgconfig 
-
-# FIXME: libXaw needs a full x11, not diet
-BROKEN = "1"
-
-do_stage () {
-	oe_runmake install DESTDIR="" mandir=${STAGING_DATADIR}/man bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/meta/packages/xorg-lib/libxcomposite_1.0.1.bb b/meta/packages/xorg-lib/libxcomposite_1.0.1.bb
deleted file mode 100644
index a60f8d517..000000000
--- a/meta/packages/xorg-lib/libxcomposite_1.0.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DEPENDS = "virtual/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/xorg-lib/libxcomposite_cvs.bb b/meta/packages/xorg-lib/libxcomposite_cvs.bb
deleted file mode 100644
index fd31b5dbf..000000000
--- a/meta/packages/xorg-lib/libxcomposite_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "virtual/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/xorg-lib/libxcursor_1.1.2.bb b/meta/packages/xorg-lib/libxcursor_1.1.2.bb
deleted file mode 100644
index 156bd80f0..000000000
--- a/meta/packages/xorg-lib/libxcursor_1.1.2.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-PRIORITY = "optional"
-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/xorg-lib/libxcursor_cvs.bb b/meta/packages/xorg-lib/libxcursor_cvs.bb
deleted file mode 100644
index 5fe2334b8..000000000
--- a/meta/packages/xorg-lib/libxcursor_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DESCRIPTION = "X Cursor library"
-DEPENDS = "libxfixes"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcursor"
-S = "${WORKDIR}/Xcursor"
-FILES_${PN} += "${libdir}/libXcursor.so"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxdamage_1.0.1.bb b/meta/packages/xorg-lib/libxdamage_1.0.1.bb
deleted file mode 100644
index a132b751c..000000000
--- a/meta/packages/xorg-lib/libxdamage_1.0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DEPENDS = "virtual/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/xorg-lib/libxdamage_cvs.bb b/meta/packages/xorg-lib/libxdamage_cvs.bb
deleted file mode 100644
index a613d0e67..000000000
--- a/meta/packages/xorg-lib/libxdamage_cvs.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "virtual/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/xorg-lib/libxdmcp_0.1.1.bb b/meta/packages/xorg-lib/libxdmcp_0.1.1.bb
deleted file mode 100644
index 1fa11acaa..000000000
--- a/meta/packages/xorg-lib/libxdmcp_0.1.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "MIT"
-PRIORITY = "optional"
-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/xorg-lib/libxdmcp_0.1.3.bb b/meta/packages/xorg-lib/libxdmcp_0.1.3.bb
deleted file mode 100644
index 20c4e5bd0..000000000
--- a/meta/packages/xorg-lib/libxdmcp_0.1.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE= "MIT"
-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/xorg-lib/libxdmcp_cvs.bb b/meta/packages/xorg-lib/libxdmcp_cvs.bb
deleted file mode 100644
index 8f0833b40..000000000
--- a/meta/packages/xorg-lib/libxdmcp_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "MIT"
-PR = "r1"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "xproto"
-PROVIDES = "xdmcp"
-DESCRIPTION = "X Display Manager Control Protocol library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdmcp"
-S = "${WORKDIR}/Xdmcp"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxext-native_cvs.bb b/meta/packages/xorg-lib/libxext-native_cvs.bb
deleted file mode 100644
index 82360db00..000000000
--- a/meta/packages/xorg-lib/libxext-native_cvs.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "unknown"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext"
-require libxext_${PV}.bb
-inherit native
-DEPENDS = "virtual/libx11-native xextensions-native"
-PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libxext_cvs.bb b/meta/packages/xorg-lib/libxext_cvs.bb
deleted file mode 100644
index 101c240c5..000000000
--- a/meta/packages/xorg-lib/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 virtual/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/xorg-lib/libxfixes_2.0.1.bb b/meta/packages/xorg-lib/libxfixes_2.0.1.bb
deleted file mode 100644
index ceebdfaa1..000000000
--- a/meta/packages/xorg-lib/libxfixes_2.0.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DEPENDS = "virtual/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/xorg-lib/libxfixes_cvs.bb b/meta/packages/xorg-lib/libxfixes_cvs.bb
deleted file mode 100644
index 92bad48ee..000000000
--- a/meta/packages/xorg-lib/libxfixes_cvs.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "virtual/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/xorg-lib/libxfont_1.4.2.bb b/meta/packages/xorg-lib/libxfont_1.4.2.bb
deleted file mode 100644
index 6053762a4..000000000
--- a/meta/packages/xorg-lib/libxfont_1.4.2.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-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/xorg-lib/libxfont_cvs.bb b/meta/packages/xorg-lib/libxfont_cvs.bb
deleted file mode 100644
index d96fd8796..000000000
--- a/meta/packages/xorg-lib/libxfont_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "BSD-X"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-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/xorg-lib/libxft_2.1.6.bb b/meta/packages/xorg-lib/libxft_2.1.6.bb
deleted file mode 100644
index a79392559..000000000
--- a/meta/packages/xorg-lib/libxft_2.1.6.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-DEPENDS = "virtual/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/xorg-lib/libxft_cvs.bb b/meta/packages/xorg-lib/libxft_cvs.bb
deleted file mode 100644
index 38ba5a6d5..000000000
--- a/meta/packages/xorg-lib/libxft_cvs.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "x11/libs"
-DEPENDS = "virtual/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/xorg-lib/libxi_6.0.1.bb b/meta/packages/xorg-lib/libxi_6.0.1.bb
deleted file mode 100644
index b9958ea6a..000000000
--- a/meta/packages/xorg-lib/libxi_6.0.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "X Input Extension library"
-LICENSE = "MIT-X"
-SECTION = "x11/libs"
-DEPENDS = "xproto virtual/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/xorg-lib/libxi_cvs.bb b/meta/packages/xorg-lib/libxi_cvs.bb
deleted file mode 100644
index f37c78e81..000000000
--- a/meta/packages/xorg-lib/libxi_cvs.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "x11/libs"
-DEPENDS = "xproto virtual/libx11 xextensions"
-DESCRIPTION = "X Input extension library."
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xi \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/Xi"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb b/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
deleted file mode 100644
index 36d05f77c..000000000
--- a/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Xinerama library"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "panoramixext xproto virtual/libx11 libxext"
-PROVIDES = "xinerama"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505"
-S = "${WORKDIR}/Xinerama"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2.bb b/meta/packages/xorg-lib/libxinerama_1.0.2.bb
deleted file mode 100644
index 3a3594c3e..000000000
--- a/meta/packages/xorg-lib/libxinerama_1.0.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "MIT"
-DESCRIPTION = "Xinerama library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "panoramixext xproto virtual/libx11 libxext"
-PROVIDES = "xinerama"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2"
-S = "${WORKDIR}/libXinerama-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxinerama_cvs.bb b/meta/packages/xorg-lib/libxinerama_cvs.bb
deleted file mode 100644
index 5138367bb..000000000
--- a/meta/packages/xorg-lib/libxinerama_cvs.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Xinerama library"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "panoramixext xproto virtual/libx11 libxext"
-PROVIDES = "xinerama"
-PV = "0.0+cvs${SRCDATE}"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama"
-S = "${WORKDIR}/Xinerama"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxkbfile_cvs.bb b/meta/packages/xorg-lib/libxkbfile_cvs.bb
deleted file mode 100644
index 336caf139..000000000
--- a/meta/packages/xorg-lib/libxkbfile_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GPL"
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11"
-DESCRIPTION = "X11 keyboard library"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile"
-S = "${WORKDIR}/xkbfile"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxmu_cvs.bb b/meta/packages/xorg-lib/libxmu_cvs.bb
deleted file mode 100644
index 500b373c3..000000000
--- a/meta/packages/xorg-lib/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/xorg-lib/libxp_cvs.bb b/meta/packages/xorg-lib/libxp_cvs.bb
deleted file mode 100644
index e434e089c..000000000
--- a/meta/packages/xorg-lib/libxp_cvs.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-
-LICENSE = "MIT"
-PV = "0.0+cvs${SRCDATE}"
-
-SECTION = "libs"
-DEPENDS = "virtual/libx11 libxext"
-DESCRIPTION = "X print extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp"
-S = "${WORKDIR}/Xp"
-
-inherit autotools pkgconfig 
-
-CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxpm_3.5.1.bb b/meta/packages/xorg-lib/libxpm_3.5.1.bb
deleted file mode 100644
index 4e63c15ef..000000000
--- a/meta/packages/xorg-lib/libxpm_3.5.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "X-BSD"
-PRIORITY = "optional"
-DEPENDS = "xproto virtual/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/xorg-lib/libxpm_cvs.bb b/meta/packages/xorg-lib/libxpm_cvs.bb
deleted file mode 100644
index df3e5f3c7..000000000
--- a/meta/packages/xorg-lib/libxpm_cvs.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "X-BSD"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "xproto virtual/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/xorg-lib/libxrandr_1.0.2.bb b/meta/packages/xorg-lib/libxrandr_1.0.2.bb
deleted file mode 100644
index d87471af0..000000000
--- a/meta/packages/xorg-lib/libxrandr_1.0.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "BSD-X"
-DEPENDS = "randrext virtual/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/xorg-lib/libxrandr_cvs.bb b/meta/packages/xorg-lib/libxrandr_cvs.bb
deleted file mode 100644
index 12f3b4ef3..000000000
--- a/meta/packages/xorg-lib/libxrandr_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "randrext virtual/libx11 libxrender libxext"
-DESCRIPTION = "X Resize and Rotate extension library."
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrandr"
-S = "${WORKDIR}/Xrandr"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxrender_0.8.4.bb b/meta/packages/xorg-lib/libxrender_0.8.4.bb
deleted file mode 100644
index 32e1962f2..000000000
--- a/meta/packages/xorg-lib/libxrender_0.8.4.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-DEPENDS = "renderext virtual/libx11"
-DESCRIPTION = "X Render extension library."
-LICENSE = "BSD"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXrender-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxrender_cvs.bb b/meta/packages/xorg-lib/libxrender_cvs.bb
deleted file mode 100644
index 31a710643..000000000
--- a/meta/packages/xorg-lib/libxrender_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-PR = "r1"
-SECTION = "libs"
-DEPENDS = "renderext virtual/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/xorg-lib/libxres_1.0.1.bb b/meta/packages/xorg-lib/libxres_1.0.1.bb
deleted file mode 100644
index 58943c467..000000000
--- a/meta/packages/xorg-lib/libxres_1.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SECTION = "x11/libs"
-DEPENDS = "virtual/libx11 xextensions libxext resourceext"
-PROVIDES = "xres"
-DESCRIPTION = "X Resource usage library."
-LICENSE = "X-MIT"
-SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2"
-S = "${WORKDIR}/libXres-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxres_cvs.bb b/meta/packages/xorg-lib/libxres_cvs.bb
deleted file mode 100644
index 02e023ee7..000000000
--- a/meta/packages/xorg-lib/libxres_cvs.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "x11/libs"
-DEPENDS = "virtual/libx11 xextensions libxext resourceext"
-PROVIDES = "xres"
-DESCRIPTION = "X Resource usage library."
-LICENSE = "X-MIT"
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes"
-S = "${WORKDIR}/XRes"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxt_0.1.5.bb b/meta/packages/xorg-lib/libxt_0.1.5.bb
deleted file mode 100644
index b0d2d230d..000000000
--- a/meta/packages/xorg-lib/libxt_0.1.5.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/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/xorg-lib/libxt_cvs.bb b/meta/packages/xorg-lib/libxt_cvs.bb
deleted file mode 100644
index 3fd2eabe6..000000000
--- a/meta/packages/xorg-lib/libxt_cvs.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libsm"
-PROVIDES = "xt"
-DESCRIPTION = "X Toolkit Intrinsics"
-LICENSE =  "X-MIT"
-PR = "r1"
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xt"
-S = "${WORKDIR}/Xt"
-
-inherit autotools pkgconfig 
-
-
-do_compile() {
-	(
-		unset CC LD CXX CCLD
-		oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
-	)
-	oe_runmake
-}
-
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxtst_cvs.bb b/meta/packages/xorg-lib/libxtst_cvs.bb
deleted file mode 100644
index dc3e358d6..000000000
--- a/meta/packages/xorg-lib/libxtst_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "GPL"
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/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/xorg-lib/libxv_2.2.2+cvs20040918.bb b/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
deleted file mode 100644
index 93c41ce12..000000000
--- a/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/libs"
-DEPENDS = "virtual/libx11 libxext"
-DESCRIPTION = "X Video extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver"
-S = "${WORKDIR}/Xv"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxv_2.2.2.bb b/meta/packages/xorg-lib/libxv_2.2.2.bb
deleted file mode 100644
index d42302979..000000000
--- a/meta/packages/xorg-lib/libxv_2.2.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/libs"
-DEPENDS = "virtual/libx11 libxext"
-DESCRIPTION = "X Video extension library."
-
-SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2"
-S = "${WORKDIR}/libXv-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/libxvmc_20040919.bb b/meta/packages/xorg-lib/libxvmc_20040919.bb
deleted file mode 100644
index f25621196..000000000
--- a/meta/packages/xorg-lib/libxvmc_20040919.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-DESCRIPTION = "X Video Motion Compensation extension library."
-SECTION = "x11/libs"
-DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
-	cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;module=libxvmc;date=${PV};method=pserver \
-	file://via.patch;patch=1 \
-	file://true.patch"
-S = "${WORKDIR}/XvMC"
-
-CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg"
-
-# this one is for via only atm.
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-inherit autotools pkgconfig 
-
-do_configure_prepend() {
-	install -d ${S}/hw/via
-	cp ${WORKDIR}/libxvmc/*.[ch] ${S}/hw/via/
-	( cd ${S}/hw/via ; patch < ${WORKDIR}/true.patch )
-}
-
-do_compile() {
-	oe_runmake
-	oe_runmake -C hw/via
-}
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
-	oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
-	install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
-}
diff --git a/meta/packages/xorg-lib/libxvmc_20041025.bb b/meta/packages/xorg-lib/libxvmc_20041025.bb
deleted file mode 100644
index ff8dda58a..000000000
--- a/meta/packages/xorg-lib/libxvmc_20041025.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "X Video Motion Compensation extension library."
-SECTION = "x11/libs"
-DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
-	file://true.patch;patch=1 file://drm.patch;patch=1"
-S = "${WORKDIR}/XvMC"
-
-CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
-
-# this one is for via only atm.
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-inherit autotools pkgconfig 
-
-do_compile() {
-	oe_runmake
-	oe_runmake -C hw/via
-}
-
-do_install() {
-	oe_runmake DESTDIR='${D}' install
-	oe_runmake -C hw/via DESTDIR='${D}' install
-}
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
-	oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
-	install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
-}
diff --git a/meta/packages/xorg-lib/libxvmc_20050612.bb b/meta/packages/xorg-lib/libxvmc_20050612.bb
deleted file mode 100644
index d9be65baa..000000000
--- a/meta/packages/xorg-lib/libxvmc_20050612.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "X Video Motion Compensation extension library."
-SECTION = "x11/libs"
-DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg"
-PR = "r0"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
-	${FREEDESKTOP_CVS}/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \
-	file://true.patch;patch=1 file://drm.patch;patch=1"
-S = "${WORKDIR}/XvMC"
-
-CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
-
-# this one is for via only atm.
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-inherit autotools pkgconfig 
-
-do_compile() {
-	oe_runmake
-	oe_runmake -C hw/via
-}
-
-do_install() {
-	oe_runmake DESTDIR='${D}' install
-	oe_runmake -C hw/via DESTDIR='${D}' install
-}
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
-	oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
-	install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
-}
diff --git a/meta/packages/xorg-lib/libxxf86dga_cvs.bb b/meta/packages/xorg-lib/libxxf86dga_cvs.bb
deleted file mode 100644
index d110e7e4c..000000000
--- a/meta/packages/xorg-lib/libxxf86dga_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "XFree86"
-
-SECTION = "x11/libs"
-DEPENDS = "virtual/libx11 libxext xxf86dgaext"
-DESCRIPTION = "Xxf86dga extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga"
-S = "${WORKDIR}/Xxf86dga"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
-}
diff --git a/meta/packages/xorg-lib/libxxf86vm_cvs.bb b/meta/packages/xorg-lib/libxxf86vm_cvs.bb
deleted file mode 100644
index 5464c4330..000000000
--- a/meta/packages/xorg-lib/libxxf86vm_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-
-SECTION = "x11/libs"
-DEPENDS = "virtual/libx11 libxext xxf86vmext"
-DESCRIPTION = "Xxf86vm extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm"
-S = "${WORKDIR}/Xxf86vm"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-lib/xtrans-native_0.1.bb b/meta/packages/xorg-lib/xtrans-native_0.1.bb
deleted file mode 100644
index db1e6e467..000000000
--- a/meta/packages/xorg-lib/xtrans-native_0.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-SECTION = "x11/base"
-require xtrans_${PV}.bb
-inherit native
diff --git a/meta/packages/xorg-lib/xtrans_0.1.bb b/meta/packages/xorg-lib/xtrans_0.1.bb
deleted file mode 100644
index f3fa0ddc3..000000000
--- a/meta/packages/xorg-lib/xtrans_0.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "x11/libs"
-LICENSE = "MIT"
-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/xorg-lib/xtrans_cvs.bb b/meta/packages/xorg-lib/xtrans_cvs.bb
deleted file mode 100644
index 73a0e4b8e..000000000
--- a/meta/packages/xorg-lib/xtrans_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-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
-}
-- 
cgit v1.2.3