From b5fabcf9fd3437b291895ebd735460b5c05a914b Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sun, 29 Oct 2006 11:07:54 +0000
Subject: [PATCH] Drop old x versions (pre X11R7)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@838 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-app/xauth_cvs.bb                | 12 ----
 meta/packages/xorg-app/xdpyinfo_cvs.bb             | 11 ----
 meta/packages/xorg-app/xhost_20040413.bb           | 13 -----
 meta/packages/xorg-app/xmodmap_cvs.bb              | 13 -----
 meta/packages/xorg-app/xrandr_cvs.bb               | 10 ----
 meta/packages/xorg-app/xrdb_cvs.bb                 | 12 ----
 meta/packages/xorg-app/xset_20040817.bb            | 17 ------
 meta/packages/xorg-proto/xproto-native_6.6.2.bb    |  4 --
 meta/packages/xorg-proto/xproto-native_cvs.bb      |  4 --
 .../xorg-proto/xproto_6.6.2+cvs20050226.bb         | 12 ----
 meta/packages/xorg-proto/xproto_6.6.2.bb           | 12 ----
 meta/packages/xorg-proto/xproto_cvs.bb             | 14 -----
 meta/packages/xorg-xserver/xserver-kdrive_cvs.bb   | 51 -----------------
 .../xorg-xserver/xserver-xorg_6.8.99.10.bb         | 65 ----------------------
 .../xorg-xserver/xserver-xorg_6.8.99.11.bb         | 65 ----------------------
 meta/packages/xorg-xserver/xserver-xorg_cvs.bb     | 61 --------------------
 16 files changed, 376 deletions(-)
 delete mode 100644 meta/packages/xorg-app/xauth_cvs.bb
 delete mode 100644 meta/packages/xorg-app/xdpyinfo_cvs.bb
 delete mode 100644 meta/packages/xorg-app/xhost_20040413.bb
 delete mode 100644 meta/packages/xorg-app/xmodmap_cvs.bb
 delete mode 100644 meta/packages/xorg-app/xrandr_cvs.bb
 delete mode 100644 meta/packages/xorg-app/xrdb_cvs.bb
 delete mode 100644 meta/packages/xorg-app/xset_20040817.bb
 delete mode 100644 meta/packages/xorg-proto/xproto-native_6.6.2.bb
 delete mode 100644 meta/packages/xorg-proto/xproto-native_cvs.bb
 delete mode 100644 meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
 delete mode 100644 meta/packages/xorg-proto/xproto_6.6.2.bb
 delete mode 100644 meta/packages/xorg-proto/xproto_cvs.bb
 delete mode 100644 meta/packages/xorg-xserver/xserver-kdrive_cvs.bb
 delete mode 100644 meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb
 delete mode 100644 meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb
 delete mode 100644 meta/packages/xorg-xserver/xserver-xorg_cvs.bb

diff --git a/meta/packages/xorg-app/xauth_cvs.bb b/meta/packages/xorg-app/xauth_cvs.bb
deleted file mode 100644
index 169de7a..0000000
--- a/meta/packages/xorg-app/xauth_cvs.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DEPENDS = "virtual/libx11 libxau libxmu libxext"
-DESCRIPTION = "X authority file utility"
-SECTION = "x11/base"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xauth \
-           file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xauth"
-
-inherit autotools pkgconfig 
diff --git a/meta/packages/xorg-app/xdpyinfo_cvs.bb b/meta/packages/xorg-app/xdpyinfo_cvs.bb
deleted file mode 100644
index 9a05f06..0000000
--- a/meta/packages/xorg-app/xdpyinfo_cvs.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DEPENDS = "virtual/libx11 libxext libxtst"
-DESCRIPTION = "X display information utility"
-SECTION = "x11/base"
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xdpyinfo"
-S = "${WORKDIR}/xdpyinfo"
-
-inherit autotools pkgconfig 
diff --git a/meta/packages/xorg-app/xhost_20040413.bb b/meta/packages/xorg-app/xhost_20040413.bb
deleted file mode 100644
index 59e8f32..0000000
--- a/meta/packages/xorg-app/xhost_20040413.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-LICENSE = "MIT"
-PV = "0.0+cvs${FIXEDSRCDATE}"
-DEPENDS = "virtual/libx11 libxext libxmu"
-DESCRIPTION = "server access control program for X"
-SECTION = "x11/base"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \
-           file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xhost"
-
-inherit autotools pkgconfig 
diff --git a/meta/packages/xorg-app/xmodmap_cvs.bb b/meta/packages/xorg-app/xmodmap_cvs.bb
deleted file mode 100644
index e2b3847..0000000
--- a/meta/packages/xorg-app/xmodmap_cvs.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-SECTION = "x11/base"
-PR = "r1"
-
-DEPENDS = "virtual/libx11"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
-           file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xmodmap"
-
-inherit autotools pkgconfig 
diff --git a/meta/packages/xorg-app/xrandr_cvs.bb b/meta/packages/xorg-app/xrandr_cvs.bb
deleted file mode 100644
index 30a31e1..0000000
--- a/meta/packages/xorg-app/xrandr_cvs.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-DEPENDS = "libxrandr virtual/libx11 libxext"
-DESCRIPTION = "X Resize and Rotate extension command."
-SECTION = "x11/base"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xrandr"
-S = "${WORKDIR}/xrandr"
-
-inherit autotools pkgconfig 
diff --git a/meta/packages/xorg-app/xrdb_cvs.bb b/meta/packages/xorg-app/xrdb_cvs.bb
deleted file mode 100644
index 1289a8c..0000000
--- a/meta/packages/xorg-app/xrdb_cvs.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-DEPENDS = "virtual/libx11 libxmu libxext"
-DESCRIPTION = "X server resource database utility"
-SECTION = "x11/base"
-LICENSE = "xrdb"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xrdb \
-           file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xrdb"
-
-inherit autotools pkgconfig 
diff --git a/meta/packages/xorg-app/xset_20040817.bb b/meta/packages/xorg-app/xset_20040817.bb
deleted file mode 100644
index 3b91812..0000000
--- a/meta/packages/xorg-app/xset_20040817.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-PV = "0.0+cvs${FIXEDSRCDATE}"
-PR = "r1"
-
-DEPENDS = "virtual/libx11 libxext xextensions libxmu"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-SECTION = "x11/base"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \
-           file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xset"
-
-inherit autotools pkgconfig 
diff --git a/meta/packages/xorg-proto/xproto-native_6.6.2.bb b/meta/packages/xorg-proto/xproto-native_6.6.2.bb
deleted file mode 100644
index 6645f59..0000000
--- a/meta/packages/xorg-proto/xproto-native_6.6.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-SECTION = "unknown"
-require xproto_${PV}.bb
-inherit native
-PROVIDES = ""
diff --git a/meta/packages/xorg-proto/xproto-native_cvs.bb b/meta/packages/xorg-proto/xproto-native_cvs.bb
deleted file mode 100644
index a34db98..0000000
--- a/meta/packages/xorg-proto/xproto-native_cvs.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-SECTION = "unknown"
-require xproto_cvs.bb
-inherit native
-PROVIDES = ""
diff --git a/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb b/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
deleted file mode 100644
index 55bc32b..0000000
--- a/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-LICENSE= "MIT"
-SECTION = "x11/libs"
-DESCRIPTION = "X protocol and ancillary headers."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226"
-S = "${WORKDIR}/Xproto"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-proto/xproto_6.6.2.bb b/meta/packages/xorg-proto/xproto_6.6.2.bb
deleted file mode 100644
index 1f01c09..0000000
--- a/meta/packages/xorg-proto/xproto_6.6.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "MIT"
-DESCRIPTION = "X protocol and ancillary headers."
-
-SRC_URI = "${XLIBS_MIRROR}/xproto-${PV}.tar.gz"
-S = "${WORKDIR}/xproto-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-proto/xproto_cvs.bb b/meta/packages/xorg-proto/xproto_cvs.bb
deleted file mode 100644
index f42fa1b..0000000
--- a/meta/packages/xorg-proto/xproto_cvs.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "MIT"
-SECTION = "x11/libs"
-DESCRIPTION = "X protocol and ancillary headers."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto"
-S = "${WORKDIR}/Xproto"
-
-inherit autotools pkgconfig
-
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_cvs.bb b/meta/packages/xorg-xserver/xserver-kdrive_cvs.bb
deleted file mode 100644
index c2b2597..0000000
--- a/meta/packages/xorg-xserver/xserver-kdrive_cvs.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-DEFAULT_PREFERENCE = "-2"
-
-LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
-PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
-PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
-SECTION = "x11/base"
-DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
-DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
-DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
-DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
-DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
-DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
-DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
-DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
-DESCRIPTION_xserver-kdrive-fake = "Fake X server"
-DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
-
-PR = "r11"
-
-FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
-FILES_xserver-kdrive-ati = "${bindir}/Xati"
-FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
-FILES_xserver-kdrive-via = "${bindir}/Xvia"
-FILES_xserver-kdrive-mga = "${bindir}/Xmga"
-FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
-FILES_xserver-kdrive-fake = "${bindir}/Xfake"
-FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
-FILES_xserver-kdrive-epson = "${bindir}/Xepson"
-FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \
-	file://kmode.patch;patch=1 \
-	file://disable-apm.patch;patch=1 \
-	file://no-serial-probing.patch;patch=1 \
-	file://kdrive-evdev.patch;patch=1  \
-	file://kdrive-use-evdev.patch;patch=1  \
-	file://fbdev-not-fix.patch;patch=1"
-
-SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-PACKAGE_ARCH_poodle = "poodle"
-
-S = "${WORKDIR}/xserver"
-
-inherit autotools pkgconfig 
-
-EXTRA_OECONF = "--enable-composite --disable-xinerama"
diff --git a/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb
deleted file mode 100644
index 37546fe..0000000
--- a/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-SECTION = "x11/base"
-RPROVIDES = "virtual/xserver"
-PROVIDES = "virtual/xserver"
-LICENSE = "Xorg"
-PR = "r2"
-
-DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
-	file://imake-staging.patch;patch=1 \
-	file://imake-installed.patch;patch=1 \
-	file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
-	file://dri.patch;patch=1"
-
-PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
-
-S = "${WORKDIR}/xc"
-
-FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*"
-FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
-FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
-FILES_${PN}-doc += "${libdir}/X11/doc"
-
-do_configure() {
-	cat <<EOF > config/cf/host.def
-#define BuildServersOnly YES
-#define ProjectRoot ${prefix}
-#define XnestServer NO
-#define XdmxServer NO
-#define CcCmd gcc
-#define LdCmd ld
-#define HasFreetype2 YES
-#define HasFontconfig YES
-#define BuildDevelDRIDrivers YES
-#define BuildXF86DRI YES
-EOF
-	echo "" > config/cf/date.def
-	rm -f include/extensions/panoramiX.h
-	make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake
-	make CC="${BUILD_CC}" xmakefile
-	make Makefiles
-	make clean
-}
-
-do_compile() {
-	#make depend
-	make includes
-	make -C config/util CC="${BUILD_CC}"
-	for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
-	make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E"
-}
-
-do_install() {
-	make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-	make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/xserver-xorg
-	for i in i810 via; do
-	  pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
-	done
-	install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
-}
diff --git a/meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb
deleted file mode 100644
index e60f62e..0000000
--- a/meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-SECTION = "x11/base"
-RPROVIDES = "virtual/xserver"
-PROVIDES = "virtual/xserver"
-LICENSE = "Xorg"
-PR = "r0"
-
-DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
-	file://imake-staging.patch;patch=1 \
-	file://imake-installed.patch;patch=1 \
-	file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
-	file://dri.patch;patch=1"
-
-PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
-
-S = "${WORKDIR}/xc"
-
-FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*"
-FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
-FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
-FILES_${PN}-doc += "${libdir}/X11/doc"
-
-do_configure() {
-	cat <<EOF > config/cf/host.def
-#define BuildServersOnly YES
-#define ProjectRoot ${prefix}
-#define XnestServer NO
-#define XdmxServer NO
-#define CcCmd gcc
-#define LdCmd ld
-#define HasFreetype2 YES
-#define HasFontconfig YES
-#define BuildDevelDRIDrivers YES
-#define BuildXF86DRI YES
-EOF
-	echo "" > config/cf/date.def
-	rm -f include/extensions/panoramiX.h
-	make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake
-	make CC="${BUILD_CC}" xmakefile
-	make Makefiles
-	make clean
-}
-
-do_compile() {
-	#make depend
-	make includes
-	make -C config/util CC="${BUILD_CC}"
-	for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
-	make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E"
-}
-
-do_install() {
-	make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-	make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/xserver-xorg
-	for i in i810 via; do
-	  pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
-	done
-	install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
-}
diff --git a/meta/packages/xorg-xserver/xserver-xorg_cvs.bb b/meta/packages/xorg-xserver/xserver-xorg_cvs.bb
deleted file mode 100644
index e410581..0000000
--- a/meta/packages/xorg-xserver/xserver-xorg_cvs.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-SECTION = "x11/base"
-LICENSE = "Xorg"
-RPROVIDES = "virtual/xserver"
-PROVIDES = "virtual/xserver"
-PR = "r3"
-PV = "6.8.1+cvs${SRCDATE}"
-
-DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
-	file://imake-staging.patch;patch=1 \
-	file://dri.patch;patch=1"
-
-PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
-
-S = "${WORKDIR}/xc"
-
-FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print"
-FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
-FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
-FILES_${PN}-doc += "${libdir}/X11/doc"
-
-do_configure() {
-	echo "#define BuildServersOnly YES" > config/cf/host.def
-	echo "#define ProjectRoot /usr" >> config/cf/host.def
-	echo "#define XnestServer NO"  >> config/cf/host.def
-	echo "#define XdmxServer NO"  >> config/cf/host.def
-	echo "#define CcCmd ${CC}" >> config/cf/host.def
-	echo "#define LdCmd ${LD}" >> config/cf/host.def
-	echo "#define HasFreetype2 YES" >> config/cf/host.def
-	echo "#define HasFontconfig YES" >> config/cf/host.def
-	echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def
-	echo "" > config/cf/date.def
-	rm -f include/extensions/panoramiX.h
-}
-
-do_compile() {
-	make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
-	make CC="${BUILD_CC}" xmakefile
-	make Makefiles
-	make clean
-	#make depend
-	make includes
-	make -C config/util CC="${BUILD_CC}"
-	for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
-	make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS=""
-}
-
-do_install() {
-	make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-	make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/xserver-xorg
-	for i in i810 via; do
-	  pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
-	done
-	install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
-}
-- 
2.7.4