Merge bk://openembedded@openembedded.bkbits.net/packages

into home.hrw.one.pl:/home/szczepan/zaurus/oe/packages

2004/06/07 13:28:16+02:00 hrw.one.pl!hrw
Renaming x-related packages from STH-cvs.oe into STH_cvs.oe

BKrev: 40c451ecy9TG4Z3gpX3SDOLhZAQ6uA

67 files changed, 145 insertions, 549 deletions

diff --git a/cairo/cairo-cvs.oe b/cairo/cairo-cvs.oe
deleted file mode 100644
index 317ae39f08..0000000000
--- a/cairo/cairo-cvs.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "x11 libpixman"
-DESCRIPTION = "Cairo graphics library"
-PROVIDES = "cairo"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=cairo"
-S = "${WORKDIR}/cairo"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/x11/diet-x11-cvs.oe b/cairo/cairo_cvs.oe
index e69de29bb2..e69de29bb2 100644
--- a/x11/diet-x11-cvs.oe
+++ b/cairo/cairo_cvs.oe
diff --git a/compositeext/compositeext_cvs.oe b/compositeext/compositeext_cvs.oe
index e69de29bb2..8f9b1be0de 100644
--- a/compositeext/compositeext_cvs.oe
+++ b/compositeext/compositeext_cvs.oe
@@ -0,0 +1,18 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xextensions fixesext"
+DESCRIPTION = "X Composite extension headers and specification"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=CompositeExt"
+S = "${WORKDIR}/CompositeExt"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/damageext/damageext_cvs.oe b/damageext/damageext_cvs.oe
index e69de29bb2..277fc428e8 100644
--- a/damageext/damageext_cvs.oe
+++ b/damageext/damageext_cvs.oe
@@ -0,0 +1,18 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xextensions fixesext"
+DESCRIPTION = "X Damage extension headers and specification"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=DamageExt"
+S = "${WORKDIR}/DamageExt"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/fdclock/fdclock-cvs.oe b/fdclock/fdclock-cvs.oe
deleted file mode 100644
index f481471da2..0000000000
--- a/fdclock/fdclock-cvs.oe
+++ /dev/null
@@ -1,12 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "x11"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "cairo"
-DESCRIPTION = "The freedesktop.org clock"
-PROVIDES = "fdclock"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=fdclock"
-S = "${WORKDIR}/fdclock"
-
-inherit autotools 
diff --git a/xaw/xaw-cvs.oe b/fdclock/fdclock_cvs.oe
index e69de29bb2..e69de29bb2 100644
--- a/xaw/xaw-cvs.oe
+++ b/fdclock/fdclock_cvs.oe
diff --git a/fixesext/fixesext-cvs.oe b/fixesext/fixesext-cvs.oe
deleted file mode 100644
index b96f9b86b2..0000000000
--- a/fixesext/fixesext-cvs.oe
+++ /dev/null
@@ -1,19 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xextensions"
-PROVIDES = "fixesext"
-DESCRIPTION = "X Fixes extension headers and specification."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=FixesExt"
-S = "${WORKDIR}/FixesExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/xmu/xmu-cvs.oe b/fixesext/fixesext_cvs.oe
index e69de29bb2..e69de29bb2 100644
--- a/xmu/xmu-cvs.oe
+++ b/fixesext/fixesext_cvs.oe
diff --git a/ice/ice-cvs.oe b/ice/ice-cvs.oe
deleted file mode 100644
index d3ed4f1392..0000000000
--- a/ice/ice-cvs.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
-PROVIDES = "ice"
-DESCRIPTION = "X11 ICE library"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ICE"
-S = "${WORKDIR}/ICE"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/ice/ice_cvs.oe b/ice/ice_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/ice/ice_cvs.oe
diff --git a/libpixman/libpixman-cvs.oe b/libpixman/libpixman-cvs.oe
deleted file mode 100644
index 3f14f0c390..0000000000
--- a/libpixman/libpixman-cvs.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "x11"
-DESCRIPTION = "Cairo support library"
-PROVIDES = "libpixman"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libpixman"
-S = "${WORKDIR}/libpixman"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/libpixman/libpixman_cvs.oe b/libpixman/libpixman_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libpixman/libpixman_cvs.oe
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index cad322e1fe..5a2d6e6ae3 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -1,7 +1,7 @@
 export IMAGE_BASENAME = "gpe-image"
 
 DEPENDS = 'task-bootstrap \
-	   diet-x11-cvs xserver matchbox-wm matchbox-desktop matchbox-panel \
+	   diet-x11 xserver matchbox-wm matchbox-desktop matchbox-panel \
 	   meta-gpe ttf-bitstream-vera'
 
 export IPKG_INSTALL = 'task-bootstrap xserver-kdrive-fbdev \
diff --git a/minimo/minimo-cvs.oe b/minimo/minimo-cvs.oe
deleted file mode 100644
index 10463c7d41..0000000000
--- a/minimo/minimo-cvs.oe
+++ /dev/null
@@ -1,57 +0,0 @@
-DEPENDS = "xt gtk+ libidl"
-SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla \
-           file://xptcstubs.patch;patch=1 \
-           file://mozconfig"
-S = "${WORKDIR}/mozilla"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "x11"
-PRIORITY = "optional"
-PV = "0.0cvs${CVSDATE}"
-FILES_${PN} += " ${libdir}/mozilla-minimo"
-
-export MINIMO=1
-export CROSS_COMPILE=1
-export CONFIGURE_ARGS="--target=${TARGET_SYS} --host=${BUILD_SYS} --build=${BUILD_SYS}"
-export CXX=${CC}
-export HOST_LIBIDL_CONFIG="libIDL-config-2"
-export MOZ_OBJDIR="${WORKDIR}/build-${TARGET_SYS}"
-export MOZCONFIG="${WORKDIR}/mozconfig"
-
-do_fetch () {
-	mkdir -p ${WORKDIR}
-	cd ${WORKDIR}
-	if [ ! -f ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz ]; then
-		cvs $CVSCOOPTS -d :pserver:anonymous@cvs-mirror.mozilla.org/cvsroot co mozilla/client.mk
-		cd mozilla
-		make -f client.mk checkout
-		cd ..
-		tar czf ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz mozilla
-	fi
-}
-
-do_configure () {
-	cp embedding/minimo/mozconfig .
-}
-
-do_compile () {
-	make -f client.mk build_all
-	cd $MOZ_OBJDIR/embedding/minimo
-	make
-}
-
-do_install () {
-	mkdir -p ${D}/${libdir}/mozilla-minimo
-	cp -rH $MOZ_OBJDIR/dist/bin/* ${D}/${libdir}/mozilla-minimo/
-	mkdir -p ${D}/${datadir}/applications
-	install -m 0644 embedding/minimo/ipkg/minimo.desktop ${D}/${datadir}/applications/minimo.desktop
-	mkdir -p ${D}/${datadir}/pixmaps
-	install -m 0644 embedding/minimo/ipkg/minimo.png ${D}/${datadir}/applications/minimo.png
-	mkdir -p ${D}/${bindir}
-	echo "#!/bin/sh" > ${D}/${bindir}/minimo
-	cat >>${D}/${bindir}/minimo << EOF
-cd ${libdir}/mozilla-minimo
-export LD_LIBRARY_PATH=${libdir}/mozilla-minimo
-exec ./Minimo http://www.mozilla.org/projects/minimo/home.html
-EOF
-	chmod 755 ${D}/${bindir}/minimo
-}
diff --git a/minimo/minimo_cvs.oe b/minimo/minimo_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/minimo/minimo_cvs.oe
diff --git a/panoramixext/panoramixext-cvs.oe b/panoramixext/panoramixext-cvs.oe
deleted file mode 100644
index 24adec8752..0000000000
--- a/panoramixext/panoramixext-cvs.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PROVIDES = "panoramixext"
-DESCRIPTION = "PanoramiX extension headers"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=PanoramiXExt"
-S = "${WORKDIR}/PanoramiXExt"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/man
-}
diff --git a/panoramixext/panoramixext_cvs.oe b/panoramixext/panoramixext_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/panoramixext/panoramixext_cvs.oe
diff --git a/randr/randr-cvs.oe b/randr/randr-cvs.oe
deleted file mode 100644
index 301207165d..0000000000
--- a/randr/randr-cvs.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-PROVIDES = "randr"
-DESCRIPTION = "X Resize and Rotate extension headers"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Randr"
-S = "${WORKDIR}/Randr"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/randr/randr_cvs.oe b/randr/randr_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/randr/randr_cvs.oe
diff --git a/recordext/recordext-cvs.oe b/recordext/recordext-cvs.oe
deleted file mode 100644
index 0bdbaa399d..0000000000
--- a/recordext/recordext-cvs.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
-PROVIDES = "recordext"
-DESCRIPTION = "XRecord extension protocol bits"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=RecordExt"
-S = "${WORKDIR}/RecordExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/recordext/recordext_cvs.oe b/recordext/recordext_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/recordext/recordext_cvs.oe
diff --git a/render/render-cvs.oe b/render/render-cvs.oe
deleted file mode 100644
index 3322b7a56e..0000000000
--- a/render/render-cvs.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-PROVIDES = "render"
-DESCRIPTION = "X Render extension headers"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Render"
-S = "${WORKDIR}/Render"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/render/render_cvs.oe b/render/render_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/render/render_cvs.oe
diff --git a/resourceext/resourceext-cvs.oe b/resourceext/resourceext-cvs.oe
deleted file mode 100644
index 78cb70e712..0000000000
--- a/resourceext/resourceext-cvs.oe
+++ /dev/null
@@ -1,19 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xextensions"
-PROVIDES = "resourceext"
-DESCRIPTION = "X Resource usage extension headers"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ResourceExt"
-S = "${WORKDIR}/ResourceExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/resourceext/resourceext_cvs.oe b/resourceext/resourceext_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/resourceext/resourceext_cvs.oe
diff --git a/rosetta/rosetta-cvs.oe b/rosetta/rosetta-cvs.oe
deleted file mode 100644
index 25b442dbf5..0000000000
--- a/rosetta/rosetta-cvs.oe
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-DEPENDS = "gtk+ libgpewidget x11 xrandr xrender xft xinerama xtst xext xau"
-PROVIDES = "rosetta"
-DESCRIPTION = "Multistroke / full word handwriting recognition for X"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=rosetta \
-	file://rosetta-makefile.patch;patch=1"
-S = "${WORKDIR}/rosetta"
-
-inherit pkgconfig
-
-FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications ${datadir}/rosetta"
-
-do_install () {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
-}
-
diff --git a/rosetta/rosetta_cvs.oe b/rosetta/rosetta_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/rosetta/rosetta_cvs.oe
diff --git a/sm/sm-cvs.oe b/sm/sm-cvs.oe
deleted file mode 100644
index da377f8705..0000000000
--- a/sm/sm-cvs.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 ice"
-PROVIDES = "sm"
-DESCRIPTION = "Session management library"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=SM"
-S = "${WORKDIR}/SM"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/sm/sm_cvs.oe b/sm/sm_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/sm/sm_cvs.oe
diff --git a/x11/diet-x11_cvs.oe b/x11/diet-x11_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/x11/diet-x11_cvs.oe
diff --git a/x11/x11_cvs.oe b/x11/x11_cvs.oe
index e69de29bb2..b5aa4c03a3 100644
--- a/x11/x11_cvs.oe
+++ b/x11/x11_cvs.oe
@@ -0,0 +1,35 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xextensions xau xtrans xdmcp"
+DESCRIPTION = "Base X libs."
+FILES_${PN}_append = " ${datadir}/X11"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11"
+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
+	)
+	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/xau/xau_cvs.oe b/xau/xau_cvs.oe
index e69de29bb2..b1fd811153 100644
--- a/xau/xau_cvs.oe
+++ b/xau/xau_cvs.oe
@@ -0,0 +1,19 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+DESCRIPTION = "Authorization Protocol for X."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xau"
+S = "${WORKDIR}/Xau"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/xaw/xaw_cvs.oe b/xaw/xaw_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xaw/xaw_cvs.oe
diff --git a/xcompmgr/xcompmgr-cvs.oe b/xcompmgr/xcompmgr-cvs.oe
deleted file mode 100644
index 474576f1c7..0000000000
--- a/xcompmgr/xcompmgr-cvs.oe
+++ /dev/null
@@ -1,11 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "x11"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 xdamage xcomposite xrender"
-DESCRIPTION = "X Compositing Manager"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xcompmgr"
-S = "${WORKDIR}/xcompmgr"
-
-inherit autotools 
diff --git a/xcompmgr/xcompmgr_cvs.oe b/xcompmgr/xcompmgr_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xcompmgr/xcompmgr_cvs.oe
diff --git a/xcomposite/xcomposite-cvs.oe b/xcomposite/xcomposite-cvs.oe
deleted file mode 100644
index 5fca365e13..0000000000
--- a/xcomposite/xcomposite-cvs.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-DEPENDS = "x11 compositeext xextensions fixesext xfixes"
-PROVIDES = "xcomposite"
-DESCRIPTION = "X Composite extension library."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcomposite"
-S = "${WORKDIR}/Xcomposite"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/xcomposite/xcomposite_cvs.oe b/xcomposite/xcomposite_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xcomposite/xcomposite_cvs.oe
diff --git a/xcursor/xcursor-cvs.oe b/xcursor/xcursor-cvs.oe
deleted file mode 100644
index a9849c0b14..0000000000
--- a/xcursor/xcursor-cvs.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PROVIDES = "xcursor"
-DESCRIPTION = "X Cursor library"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcursor"
-S = "${WORKDIR}/Xcursor"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/man
-}
diff --git a/xcursor/xcursor_cvs.oe b/xcursor/xcursor_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xcursor/xcursor_cvs.oe
diff --git a/xdamage/xdamage-cvs.oe b/xdamage/xdamage-cvs.oe
deleted file mode 100644
index 4cfdea669f..0000000000
--- a/xdamage/xdamage-cvs.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-#DEPENDS=virtual/libc x11-cvs damageext-cvs xextensions-cvs fixesext-cvs xfixes-cvs
-DEPENDS = "x11 damageext xfixes xproto"
-PROVIDES = "xdamage"
-DESCRIPTION = "X Damage extension library."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdamage \
-	   file://m4.patch;patch=1"
-S = "${WORKDIR}/Xdamage"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/xdamage/xdamage_cvs.oe b/xdamage/xdamage_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xdamage/xdamage_cvs.oe
diff --git a/xext/xext-cvs.oe b/xext/xext-cvs.oe
deleted file mode 100644
index 33476130a7..0000000000
--- a/xext/xext-cvs.oe
+++ /dev/null
@@ -1,19 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-DESCRIPTION = "X Server Extension library"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "xproto x11 xextensions"
-PROVIDES = "xext"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xext"
-S = "${WORKDIR}/Xext"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/xext/xext_cvs.oe b/xext/xext_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xext/xext_cvs.oe
diff --git a/xextensions/xextensions_cvs.oe b/xextensions/xextensions_cvs.oe
index e69de29bb2..1289c60792 100644
--- a/xextensions/xextensions_cvs.oe
+++ b/xextensions/xextensions_cvs.oe
@@ -0,0 +1,17 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "various extension headers."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XExtensions"
+S = "${WORKDIR}/XExtensions"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/xfixes/xfixes-cvs.oe b/xfixes/xfixes-cvs.oe
deleted file mode 100644
index 3477e353bb..0000000000
--- a/xfixes/xfixes-cvs.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-DEPENDS = "x11 fixesext"
-PROVIDES = "xfixes"
-DESCRIPTION = "X Fixes extension library."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfixes"
-S = "${WORKDIR}/Xfixes"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/xfixes/xfixes_cvs.oe b/xfixes/xfixes_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xfixes/xfixes_cvs.oe
diff --git a/xfont/xfont-cvs.oe b/xfont/xfont-cvs.oe
deleted file mode 100644
index 6bed0448d9..0000000000
--- a/xfont/xfont-cvs.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto xtrans zlib"
-PROVIDES = "xfont"
-DESCRIPTION = "X font libary (used by the X server)."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfont"
-S = "${WORKDIR}/Xfont"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/xfont/xfont_cvs.oe b/xfont/xfont_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xfont/xfont_cvs.oe
diff --git a/xft/xft-cvs.oe b/xft/xft-cvs.oe
deleted file mode 100644
index 6522d3cd08..0000000000
--- a/xft/xft-cvs.oe
+++ /dev/null
@@ -1,30 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-DEPENDS = "x11 xproto xrender freetype fontconfig"
-PROVIDES = "xft"
-DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/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() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
-}
-
-python do_package() {
-        if oe.data.getVar('DEBIAN_NAMES', d, 1):
-            oe.data.setVar('PKG_${PN}', 'libxft2', d)
-        oe.build.exec_func('package_do_package', d)
-}
diff --git a/xft/xft_cvs.oe b/xft/xft_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xft/xft_cvs.oe
diff --git a/xi/xi-cvs.oe b/xi/xi-cvs.oe
deleted file mode 100644
index 717f63f350..0000000000
--- a/xi/xi-cvs.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-DEPENDS = "x11 xextensions"
-PROVIDES = "xi"
-DESCRIPTION = "X Input extension library."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xi"
-S = "${WORKDIR}/Xi"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/xi/xi_cvs.oe b/xi/xi_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xi/xi_cvs.oe
diff --git a/xinerama/xinerama-cvs.oe b/xinerama/xinerama-cvs.oe
deleted file mode 100644
index 2980b5342d..0000000000
--- a/xinerama/xinerama-cvs.oe
+++ /dev/null
@@ -1,21 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "panoramixext"
-PROVIDES = "xinerama"
-DESCRIPTION = "Xinerama library"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xinerama"
-S = "${WORKDIR}/Xinerama"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/man
-}
diff --git a/xinerama/xinerama_cvs.oe b/xinerama/xinerama_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xinerama/xinerama_cvs.oe
diff --git a/xmu/xmu_cvs.oe b/xmu/xmu_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xmu/xmu_cvs.oe
diff --git a/xpm/xpm-cvs.oe b/xpm/xpm-cvs.oe
deleted file mode 100644
index f24ab3042b..0000000000
--- a/xpm/xpm-cvs.oe
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto x11"
-PROVIDES = "xpm"
-DESCRIPTION = "X Pixmap library."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/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/xpm/xpm_cvs.oe b/xpm/xpm_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xpm/xpm_cvs.oe
diff --git a/xproto/xproto_cvs.oe b/xproto/xproto_cvs.oe
index e69de29bb2..bcf2d4ab66 100644
--- a/xproto/xproto_cvs.oe
+++ b/xproto/xproto_cvs.oe
@@ -0,0 +1,18 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "X protocol and ancillary headers."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xproto"
+S = "${WORKDIR}/Xproto"
+
+inherit autotools pkgconfig
+
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/xrender/xrender-cvs.oe b/xrender/xrender-cvs.oe
deleted file mode 100644
index adcc3e24b3..0000000000
--- a/xrender/xrender-cvs.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-DEPENDS = "render x11"
-PROVIDES = "xrender"
-DESCRIPTION = "X Render extension library."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrender"
-S = "${WORKDIR}/Xrender"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/xrender/xrender_cvs.oe b/xrender/xrender_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xrender/xrender_cvs.oe
diff --git a/xres/xres-cvs.oe b/xres/xres-cvs.oe
deleted file mode 100644
index 53c3e1c6fa..0000000000
--- a/xres/xres-cvs.oe
+++ /dev/null
@@ -1,19 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "x11 xextensions xext resourceext"
-PROVIDES = "xres"
-DESCRIPTION = "X Resource usage library."
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XRes"
-S = "${WORKDIR}/XRes"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/xres/xres_cvs.oe b/xres/xres_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xres/xres_cvs.oe
diff --git a/xt/xt-cvs.oe b/xt/xt-cvs.oe
deleted file mode 100644
index 06ec250caf..0000000000
--- a/xt/xt-cvs.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 sm"
-PROVIDES = "xt"
-DESCRIPTION = "X Toolkit Intrinsics"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xt"
-S = "${WORKDIR}/Xt"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/xt/xt_cvs.oe b/xt/xt_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xt/xt_cvs.oe
diff --git a/xtrans/xtrans_cvs.oe b/xtrans/xtrans_cvs.oe
index e69de29bb2..fa420c0eeb 100644
--- a/xtrans/xtrans_cvs.oe
+++ b/xtrans/xtrans_cvs.oe
@@ -0,0 +1,19 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=xtrans"
+S = "${WORKDIR}/xtrans"
+
+inherit autotools  pkgconfig
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/xtst/xtst-cvs.oe b/xtst/xtst-cvs.oe
deleted file mode 100644
index 26d0e9b08b..0000000000
--- a/xtst/xtst-cvs.oe
+++ /dev/null
@@ -1,21 +0,0 @@
-PV = "0.0cvs${CVSDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 recordext"
-PROVIDES = "xtst"
-DESCRIPTION = "X Test Extension: client side library"
-
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xtst \
-           file://no-xrecord.patch;patch=1;pnum=0"
-S = "${WORKDIR}/Xtst"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/xtst/xtst_cvs.oe b/xtst/xtst_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xtst/xtst_cvs.oe