Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/22 18:22:54+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/22 18:14:34+02:00 void!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into  dominion.dominion.void:/data/build/oe/openembedded

2005/05/22 17:05:21+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/05/22 01:13:55+02:00 uni-frankfurt.de!mickeyl
python-pickle depends on python-codecs

2005/05/21 22:38:37+02:00 uni-frankfurt.de!mickeyl
fix evas-x11 typo

2005/05/21 20:20:50+02:00 uni-frankfurt.de!mickeyl
clean up the imlib2 situation. remove bogus files, split into .inc, -native, -fb, x11

2005/05/21 18:21:42+01:00 rpsys.net!RP
jlime jornada6xx and jornada7xx updates from Kristoffer Ericson

2005/05/21 19:11:16+02:00 uni-frankfurt.de!mickeyl
remove broken e files

2005/05/21 15:47:58+02:00 void!koen
imlib2-x11_1.2.0.004.bb:  fix src_uri, the fetcher choked on the fetch.php?file=bla.tar.bz2. Could the EFL maintainer fix this?

2005/05/21 14:37:02+02:00 uni-frankfurt.de!mickeyl
add opie-pcmciaapplet

2005/05/21 14:35:44+02:00 uni-frankfurt.de!mickeyl
bump openzaurus-3.5.4 CVSDATE

2005/05/21 14:32:25+02:00 uni-frankfurt.de!mickeyl
split ecore into .inc, -fb, -x11 files. remove broken ecore files

2005/05/21 14:25:30+02:00 uni-frankfurt.de!mickeyl
reorganize evas and split into .inc, -fb, and -x11 files

2005/05/21 13:26:17+02:00 uni-frankfurt.de!mickeyl
add udev 058

2005/05/21 12:50:08+02:00 uni-frankfurt.de!mickeyl
task-python-everything: add pytest and pyweather

2005/05/21 12:43:57+02:00 uni-frankfurt.de!mickeyl
add pytest, a reflective unit testing support module
add pyweather, conversion module for weather scientists
upgrade pysqlite to 2.0.2

BKrev: 4290b5f22-A_n5BGjkjPp0-Fb1tzvg

38 files changed, 362 insertions, 590 deletions

diff --git a/conf/distro/jlime.conf b/conf/distro/jlime.conf
index e69de29bb2..599137493c 100644
--- a/conf/distro/jlime.conf
+++ b/conf/distro/jlime.conf
@@ -0,0 +1,48 @@
+#@TYPE : Distribution <SHREK>
+#@NAME : Jornada Linux Mobility Edition (JLime) <www.jlime.com>
+#@DESCRIPTION : Linux for HP jornada 5xx,6xx,7xx,8xx series
+#Created and Maintained by Kristoffer Ericson <Kristoffer@jlime.com>
+
+DISTRO = "Jornada Linux Mobility Edition"
+DISTRO_NAME = "JLime"
+DISTRO_VERSION = "Shrek"
+DISTRO_TYPE = "release"
+
+export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/releases/shrek/${TARGET_ARCH}/feed/"
+
+CVSDATE = 20050518
+
+PREFERRED_PROVIDERS  =  "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+PREFERRED_PROVIDER_virtual/kernel = "jlime-kernel-${TARGET_ARCH}"
+PREFERRED_PROVIDER_xserver        = "xserver-kdrive"
+
+PREFERRED_VERSION_binutils = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
+PREFERRED_VERSION_gcc = "3.4.3"
+PREFERRED_VERSION_gcc-cross = "3.4.3"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.3"
+PREFERRED_VERSION_linuc-libc-headers = "2.6.7.0"                                             		    
+PREFERRED_VERSION_glib-2.0-native = "2.6.2"
+PREFERRED_VERSION_glib-2.0 = "2.6.2"
+PREFERRED_VERSION_dpkg = "1.10.23"
+PREFERRED_VERSION_qte = "4.0.0-snapshot"
+
+INHERIT += "package_tar package_ipk"
+BBINCLUDELOGS = "yes"
+MODUTILS = "26"
+IMAGE_FSTYPES = "tar"
+
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs ncurses nano virtual/kernel wireless-tools console-tools"
+BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools            \ 
+kernel-module-3c574-cs    kernel-module-3c589-cs    kernel-module-8390        \
+kernel-module-airo-cs     kernel-module-airo        console-tools             \
+kernel-module-arlan                                                           \
+kernel-module-atmel-cs    kernel-module-atmel       kernel-module-axnet-cs    \
+kernel-module-hermes                                                          \
+kernel-module-wavelan     kernel-module-wavelan-cs                            \
+kernel-module-xirc2ps-cs  kernel-module-orinoco-cs  kernel-module-orinoco     \
+kernel-module-nmclan-cs   kernel-module-pcnet-cs    e2tools e2fsprogs"
diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf
index bc5a4007c8..b4f1f81732 100644
--- a/conf/distro/openzaurus-3.5.4.conf
+++ b/conf/distro/openzaurus-3.5.4.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
 	console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
 	devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
 
-CVSDATE = "20050516"
+CVSDATE = "20050521"
 
 #
 # Zaurus
diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc
index 545f32f992..ff608f28f2 100644
--- a/conf/distro/preferred-opie-versions.inc
+++ b/conf/distro/preferred-opie-versions.inc
@@ -113,6 +113,7 @@ PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index e69de29bb2..5e81c35430 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: HP Jornada 680
+#@DESCRIPTION: Machine configuration for the HITACHI SH3 based HP Jornada 6xx palmtop computer
+
+TARGET_ARCH = "sh3"
+IPKG_ARCHS = "all sh3 ${MACHINE}"
+PREFERRED_VERSION_glibc = "2.3.4"
+PREFERRED_VERSION_glibc-initial = "2.3.4"
+
+include conf/machine/tune-sh3.conf
diff --git a/conf/machine/jornada720.conf b/conf/machine/jornada7xx.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/machine/jornada720.conf
+++ b/conf/machine/jornada7xx.conf
diff --git a/packages/ecore/ecore-core_0.9.9.004.bb b/packages/ecore/ecore-fb_0.9.9.007.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/ecore/ecore-core_0.9.9.004.bb
+++ b/packages/ecore/ecore-fb_0.9.9.007.bb
diff --git a/packages/ecore/ecore-fb-x11_0.9.9.004.bb b/packages/ecore/ecore-x11_0.9.9.007.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/ecore/ecore-fb-x11_0.9.9.004.bb
+++ b/packages/ecore/ecore-x11_0.9.9.007.bb
diff --git a/packages/ecore/ecore-fb_0.9.9.004.bb b/packages/ecore/ecore_0.9.9.007.inc
index e69de29bb2..e69de29bb2 100644
--- a/packages/ecore/ecore-fb_0.9.9.004.bb
+++ b/packages/ecore/ecore_0.9.9.007.inc
diff --git a/packages/ecore/ecore_cvs.bb b/packages/ecore/ecore_cvs.bb
deleted file mode 100644
index 4d336ab50e..0000000000
--- a/packages/ecore/ecore_cvs.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "Ecore is the core event abstraction layer for the \
-enlightenment foundation libraries. It makes makes doing selections, drag \
-and drop, event loops, timeouts and idle handlers fast, optimized, and \
-convenient."
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "eet evas diet-x11 xserver-kdrive"
-PR = "1"
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net:/cvsroot/enlightenment;module=ecore"
-S = "${WORKDIR}/ecore"
-
-inherit autotools binconfig
-
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
-
-EXTRA_OECONF = "--enable-ecore-fb \
-		--enable-ecore-job \
-                --enable-ecore-evas \
-		--enable-ecore-evas-fb \
-		--enable-ecore-evas-x \
-		--disable-ecore-evas-gl \
-		--enable-ecore-con \
-		--enable-ecore-ipc \
-		--enable-ecore-txt \
-		--enable-ecore-x \
-		--enable-ecore-config \
-		--disable-openssl"
-
-parts = "Ecore Ecore_Job \
-	 Ecore_Txt Ecore_Fb Ecore_Con \
-	 Ecore_Ipc Ecore_Evas Ecore_Config \
-         Ecore_X"
-
-do_stage () {
-  for p in ${parts}; do
-    dir=`echo $p|tr A-Z a-z`
-    install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
-    oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
-  done
-  install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
-  install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-PACKAGES += "ecore-examples"
-
-FILES_${PN} = "${libdir}/libecore*.so* ${libdir}/ecore_config_ipc_ecore.so"
-FILES_${PN}-dev += "${bindir}/ecore-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/ecore_test ${bindir}/ecore_evas_test ${datadir}"
diff --git a/packages/edje/edje_cvs.bb b/packages/edje/edje_cvs.bb
deleted file mode 100644
index 12e41f4233..0000000000
--- a/packages/edje/edje_cvs.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Edje is a graphical layout and animation library for animated \
-resizable, compressed and scalable themes."
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "evas ecore embryo eet imlib2"
-PV = "0.5.0"
-PR = "1"
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-  
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net:/cvsroot/enlightenment;module=edje"
-
-S = "${WORKDIR}/edje"
-  
-inherit autotools pkgconfig binconfig
-
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
-export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
-export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
-export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config"
-
-LEAD_SONAME = "libedje.so"
-
-do_stage () {
-  oe_libinstall -C src/lib libedje ${STAGING_LIBDIR}/
-  install -m 0644 ${S}/src/lib/Edje.h ${STAGING_INCDIR}/
-}
-
-PACKAGES += "edje-tools edje-compiler"
-
-FILES_${PN} = "${libdir}/libedje*.so*"
-FILES_${PN}-dev += "${bindir}/edje-config ${libdir}/pkgconfig"
-FILES_${PN}-compiler = "${bindir}/edje_cc ${datadir}/edje/include"
-FILES_${PN}-tools = "${bindir}/edje ${bindir}/edje_ls ${datadir}/edje/data/test"
-
diff --git a/packages/eet/eet_cvs.bb b/packages/eet/eet_cvs.bb
deleted file mode 100644
index bcdb8e7366..0000000000
--- a/packages/eet/eet_cvs.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "EET is a tiny library designed to write an \
-arbitary set of chunks of data to a file and optionally compress \
-each chunk (very much like a zip file) and allow fast \
-random-access reading of the file later on."
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "zlib jpeg"
-
-PR = "1"
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net:/cvsroot/enlightenment;module=eet"
-
-S = "${WORKDIR}/eet"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-  bb_libinstall -C src/lib libeet ${STAGING_LIBDIR}/
-  install -m 0644 ${S}/src/lib/Eet.h ${STAGING_INCDIR}/
-}
-
-FILES_${PN} = "${libdir}/libeet*.so*"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
diff --git a/packages/embryo/embryo_cvs.bb b/packages/embryo/embryo_cvs.bb
deleted file mode 100644
index 63f0acc5d7..0000000000
--- a/packages/embryo/embryo_cvs.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Embryo is a tiny library designed to provide a virutal \
-machine system for executing small pieces of code logic very quickly."
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = ""
-PR = "1"
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-  
-SRC_URI="cvs://anonymous@cvs.sourceforge.net:/cvsroot/enlightenment;module=embryo"
-
-S = "${WORKDIR}/embryo"
-  
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-  oe_libinstall -C src/lib libembryo ${STAGING_LIBDIR}
-  install -m 0644 ${S}/src/lib/Embryo.h ${STAGING_INCDIR}
-}
-
-PACKAGES += "embryo-tools emebryo-compiler"
-
-FILES_${PN} = "${libdir}/libembryo*.so*"
-FILES_${PN}-dev += "${bindir}/embryo-bin ${libdir}/pkgconfig"
-FILES_${PN}-compiler += "${bindir}/embryo_cc ${datadir}"
-FILES_${PN}-tools += "${bindir}/embryo"
-
diff --git a/packages/ecore/ecore-x11_0.9.9.004.bb b/packages/evas/evas-fb_0.0.9.007.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/ecore/ecore-x11_0.9.9.004.bb
+++ b/packages/evas/evas-fb_0.0.9.007.bb
diff --git a/packages/evas/evas-x11-fb_0.9.9.004.bb b/packages/evas/evas-x11-fb_0.9.9.004.bb
deleted file mode 100644
index 487826af70..0000000000
--- a/packages/evas/evas-x11-fb_0.9.9.004.bb
+++ /dev/null
@@ -1,86 +0,0 @@
-DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
-anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
-down to using normal X11 primitives such as pixmaps, lines and rectangles if \
-your CPU or graphics hardware are too slow."
-LICENSE = "BSD"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Nigel Kostiuck <emte@labotomy.net>"
-SECTION = "efl/libs"
-PRIORITY = "optional"
-DEPENDS = "libpng jpeg edb eet freetype"
-PR = "2"
-
-SRC_URI = "http://enlightenment.freedesktop.org/fetch.php?file=evas-0.9.9.004.tar.gz" 
-S = "${WORKDIR}/evas"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--enable-fb			\
-		--disable-directfb		\
-		--disable-buffer		\
-		--disable-software-qtopia	\
-		--with-x			\
-		--enable-software-x11		\
-		--disable-gl-x11		\
-		--enable-image-loader-eet	\
-		--enable-image-loader-edb	\
-		--enable-image-loader-png	\
-		--enable-image-loader-jpeg	\
-		--enable-small-dither-mask	\
-		--enable-cpu-c			\
-		--enable-font-loader-eet	\
-		--enable-scale-sample		\
-		--enable-scale-smooth		\
-		--enable-convert-yuv		\
-		--disable-convert-8-rgb-332	\
-		--disable-convert-8-rgb-666	\
-		--disable-convert-8-rgb-232	\
-		--disable-convert-8-rgb-222	\
-		--disable-convert-8-rgb-221	\
-		--disable-convert-8-rgb-121	\
-		--disable-convert-8-rgb-111	\
-		--enable-convert-16-rgb-565	\
-		--disable-convert-16-rgb-555	\
-		--disable-convert-16-rgb-444	\
-		--disable-convert-16-rgb-ipq	\
-		--enable-convert-16-rgb-rot-0	\
-		--disable-convert-16-rgb-rot-90	\
-		--enable-convert-16-rgb-rot-270	\
-		--disable-convert-24-rgb-888	\
-		--disable-convert-24-bgr-888	\
-		--disable-convert-32-rgb-8888	\
-		--disable-convert-32-rgbx-8888	\
-		--disable-convert-32-bgr-8888	\
-		--disable-convert-32-bgrx-8888	\
-		--disable-convert-32-rgb-rot-0	\
-		--disable-convert-32-rgb-rot-90	\
-		--disable-convert-32-rgb-rot-270"
-
-do_configure () {
-	install -m 0644 ${WORKDIR}/pkg.m4 acinclude.m4
-	autotools_do_configure
-}
-
-headers = "Evas_Engine_Buffer.h \
-           Evas_Engine_FB.h \
-           Evas.h"
-
-# Don't install these headers or subsequent libraries will include support for it:
-# Evas_Engine_DirectFB.h \
-# Evas_Engine_GL_X11.h \
-# Evas_Engine_Software_Win32_GDI.h \
-# Evas_Engine_Software_X11.h
-# Evas_Engine_Software_Qtopia.h \
-
-do_stage () {
-	for i in ${headers}; do
-		install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-	done
-	oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
-}
-
-PACKAGES += "evas-examples"
-
-FILES_${PN} = "${libdir}/libevas*.so*"
-FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/evas_fb_test ${datadir}"
diff --git a/packages/ecore/ecore_0.9.9.007.bb b/packages/evas/evas-x11_0.0.9.007.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/ecore/ecore_0.9.9.007.bb
+++ b/packages/evas/evas-x11_0.0.9.007.bb
diff --git a/packages/evas/evas-x11_0.9.9.004.bb b/packages/evas/evas-x11_0.9.9.004.bb
deleted file mode 100644
index 5f8b7376cc..0000000000
--- a/packages/evas/evas-x11_0.9.9.004.bb
+++ /dev/null
@@ -1,86 +0,0 @@
-DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
-anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
-down to using normal X11 primitives such as pixmaps, lines and rectangles if \
-your CPU or graphics hardware are too slow."
-LICENSE = "BSD"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Nigel Kostiuck <emte@labotomy.net>"
-SECTION = "efl/libs"
-PRIORITY = "optional"
-DEPENDS = "libpng jpeg edb eet freetype"
-PR = "2"
-
-SRC_URI = "http://enlightenment.freedesktop.org/fetch.php?file=evas-0.9.9.004.tar.gz" 
-S = "${WORKDIR}/evas"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--disable-fb			\
-		--disable-directfb		\
-		--disable-buffer		\
-		--disable-software-qtopia	\
-		--with-x			\
-		--enable-software-x11		\
-		--disable-gl-x11		\
-		--enable-image-loader-eet	\
-		--enable-image-loader-edb	\
-		--enable-image-loader-png	\
-		--enable-image-loader-jpeg	\
-		--enable-small-dither-mask	\
-		--enable-cpu-c			\
-		--enable-font-loader-eet	\
-		--enable-scale-sample		\
-		--enable-scale-smooth		\
-		--enable-convert-yuv		\
-		--disable-convert-8-rgb-332	\
-		--disable-convert-8-rgb-666	\
-		--disable-convert-8-rgb-232	\
-		--disable-convert-8-rgb-222	\
-		--disable-convert-8-rgb-221	\
-		--disable-convert-8-rgb-121	\
-		--disable-convert-8-rgb-111	\
-		--enable-convert-16-rgb-565	\
-		--disable-convert-16-rgb-555	\
-		--disable-convert-16-rgb-444	\
-		--disable-convert-16-rgb-ipq	\
-		--enable-convert-16-rgb-rot-0	\
-		--disable-convert-16-rgb-rot-90	\
-		--enable-convert-16-rgb-rot-270	\
-		--disable-convert-24-rgb-888	\
-		--disable-convert-24-bgr-888	\
-		--disable-convert-32-rgb-8888	\
-		--disable-convert-32-rgbx-8888	\
-		--disable-convert-32-bgr-8888	\
-		--disable-convert-32-bgrx-8888	\
-		--disable-convert-32-rgb-rot-0	\
-		--disable-convert-32-rgb-rot-90	\
-		--disable-convert-32-rgb-rot-270"
-
-do_configure () {
-	install -m 0644 ${WORKDIR}/pkg.m4 acinclude.m4
-	autotools_do_configure
-}
-
-headers = "Evas_Engine_Buffer.h \
-           Evas_Engine_FB.h \
-           Evas.h"
-
-# Don't install these headers or subsequent libraries will include support for it:
-# Evas_Engine_DirectFB.h \
-# Evas_Engine_GL_X11.h \
-# Evas_Engine_Software_Win32_GDI.h \
-# Evas_Engine_Software_X11.h
-# Evas_Engine_Software_Qtopia.h \
-
-do_stage () {
-	for i in ${headers}; do
-		install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-	done
-	oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
-}
-
-PACKAGES += "evas-examples"
-
-FILES_${PN} = "${libdir}/libevas*.so*"
-FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/evas_fb_test ${datadir}"
diff --git a/packages/edje/edje-core_0.5.0.004.bb b/packages/evas/evas_0.9.9.007.inc
index e69de29bb2..e69de29bb2 100644
--- a/packages/edje/edje-core_0.5.0.004.bb
+++ b/packages/evas/evas_0.9.9.007.inc
diff --git a/packages/evas/evas_cvs.bb b/packages/evas/evas_cvs.bb
deleted file mode 100644
index 970bbde772..0000000000
--- a/packages/evas/evas_cvs.bb
+++ /dev/null
@@ -1,90 +0,0 @@
-DESCRIPTION = "Evas is a clean display canvas API for several target display \
-systems that can draw anti-aliased text, smooth super and sub-sampled scaled \
-images, alpha-blend objects much and more."
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "libpng jpeg eet freetype"
-PR = "1"
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-  
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net:/cvsroot/enlightenment;module=evas"
-S = "${WORKDIR}/evas"
-  
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--enable-fb			\
-		--disable-directfb		\
-		--enable-buffer			\
-		--disable-software-qtopia	\
-		--enable-software-x11		\
-		--disable-gl-x11		\
-		--disable-cairo-x11		\
-		--enable-image-loader-eet	\
-		--disable-image-loader-edb	\
-		--enable-image-loader-png	\
-		--enable-image-loader-jpeg	\
-		--enable-small-dither-mask	\
-		--enable-cpu-c			\
-		--enable-font-loader-eet	\
-		--enable-scale-sample		\
-		--enable-scale-smooth		\
-		--enable-convert-yuv		\
-		--disable-small-dither-mask	\
-		--disable-convert-8-rgb-332	\
-		--disable-convert-8-rgb-666	\
-		--disable-convert-8-rgb-232	\
-		--disable-convert-8-rgb-222	\
-		--disable-convert-8-rgb-221	\
-		--disable-convert-8-rgb-121	\
-		--disable-convert-8-rgb-111	\
-		--enable-convert-16-rgb-565	\
-		--disable-convert-16-rgb-555	\
-		--disable-convert-16-rgb-444	\
-		--disable-convert-16-rgb-ipq	\
-		--enable-convert-16-rgb-rot-0	\
-		--disable-convert-16-rgb-rot-90	\
-		--enable-convert-16-rgb-rot-270	\
-		--disable-convert-24-rgb-888	\
-		--disable-convert-24-bgr-888	\
-		--disable-convert-32-rgb-8888	\
-		--disable-convert-32-rgbx-8888	\
-		--disable-convert-32-bgr-8888	\
-		--disable-convert-32-bgrx-8888	\
-		--disable-convert-32-rgb-rot-0	\
-		--disable-convert-32-rgb-rot-90	\
-		--disable-convert-32-rgb-rot-270"
-
-export CFLAGS="-O3 -mcpu=xscale -mtune=xscale"
-export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config"
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-
-do_configure () {
-  autotools_do_configure
-}
-
-headers = "Evas_Engine_Buffer.h \
-           Evas_Engine_Software_X11.h \
-           Evas_Engine_FB.h \
-           Evas.h"
-
-do_stage () {
-  for i in ${headers}; do
-    install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-  done
-  oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
-}
-
-PACKAGES += "evas-examples"
-
-FILES_${PN} = "${libdir}/libevas*.so*"
-FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/evas_fb_test"
-FILES_${PN}-examples += "${bindir}/evas_software_x11_test"
-FILES_${PN}-examples += "${bindir}/evas_buffer_x11_test"
-FILES_${PN}-examples += "${datadir}"
diff --git a/packages/imlib2/imlib2-1.1.0/autofoo.patch b/packages/imlib2/imlib2-1.1.0/autofoo.patch
deleted file mode 100644
index 1980d7b2c9..0000000000
--- a/packages/imlib2/imlib2-1.1.0/autofoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- imlib2-1.1.0/libltdl/configure.in~autofoo
-+++ imlib2-1.1.0/libltdl/configure.in
-@@ -1,6 +1,7 @@
- dnl Process this file with autoconf to create configure.
- 
- AC_INIT(ltdl.c)
-+AC_CONFIG_AUX_DIR([..])
- 
- dnl We shouldn't be using these internal macros of autoconf,
- dnl but CONFIG_AUX_DIR($with_auxdir) breaks automake.
diff --git a/packages/imlib2/imlib2-1.1.0/cross.patch b/packages/imlib2/imlib2-1.1.0/cross.patch
deleted file mode 100644
index bb4ed1784d..0000000000
--- a/packages/imlib2/imlib2-1.1.0/cross.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- imlib2-1.1.0/demo/Makefile.am~cross
-+++ imlib2-1.1.0/demo/Makefile.am
-@@ -8,8 +8,7 @@
- LDFLAGS              = -L/usr/X11R6/lib
- INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
--                       -I/usr/X11R6/include $(X_CFLAGS) \
--                       -I$(prefix)/include -I$(includedir)
-+                       $(X_CFLAGS)
- 
- bin_PROGRAMS         = imlib2_view imconvert
- imconvert_SOURCES    = imconvert.c
---- imlib2-1.1.0/filters/Makefile.am~cross
-+++ imlib2-1.1.0/filters/Makefile.am
-@@ -8,8 +8,7 @@
- LDFLAGS		     = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib
- INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
--                       -I/usr/X11R6/include $(X_CFLAGS) \
--                       -I$(prefix)/include -I$(includedir)
-+                       $(X_CFLAGS)
-