Merge openembedded@openembedded.bkbits.net:packages

into linux.local:/home/kergoth/code/packages 2004/05/09 20:52:43-04:00 local!kergoth Libtool updates, no longer directly inherit libtool. 2004/05/09 20:52:08-04:00 local!kergoth Update libtool bits. libtoolize no longer requires a runtime STAGING_DIR var set. BKrev: 409ed25fQy7BIGJH5qwdtr0BClqFVw
author: Chris Larson <clarson@kergoth.com> 2004-05-10 00:52:47 +0000
committer: Chris Larson <clarson@kergoth.com> 2004-05-10 00:52:47 +0000
commit: cb2f160c0ebcbf8421988e7ee9818e007e085305 (patch)
tree: 7b25aca42bcde8335efe58709261da5ca5504f70
parent: e18dbb2be3143c54092ca6025161cbc750990b0a (diff)
193 files changed, 716 insertions, 178 deletions
diff --git a/aalib/aalib_1.4rc5.oe b/aalib/aalib_1.4rc5.oe
index 0d37a0df95..9306602346 100644
--- a/aalib/aalib_1.4rc5.oe
+++ b/aalib/aalib_1.4rc5.oe
@@ -5,7 +5,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1"
 S = "${WORKDIR}/aalib-1.4.0"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = '--without-x11-driver --without-slang-driver \
 		--with-curses-driver --without-gpm \
diff --git a/alsa-lib/alsa-lib_1.0.4.oe b/alsa-lib/alsa-lib_1.0.4.oe
index e69de29bb2..3c863006f8 100644
--- a/alsa-lib/alsa-lib_1.0.4.oe
+++ b/alsa-lib/alsa-lib_1.0.4.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "Alsa sound library"
+MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc"
+FILES_alsa-lib_append = " ${datadir}/alsa"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2"
+
+inherit autotools  pkgconfig
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
+
+do_stage () {
+	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/alsa/sound
+	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
+	install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
+}
diff --git a/alsa-oss/alsa-oss_1.0.4.oe b/alsa-oss/alsa-oss_1.0.4.oe
index e69de29bb2..118da08dbe 100644
--- a/alsa-oss/alsa-oss_1.0.4.oe
+++ b/alsa-oss/alsa-oss_1.0.4.oe
@@ -0,0 +1,19 @@
+DESCRIPTION = "Alsa OSS Compatibility Package"
+MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc alsa-lib"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
+	   file://${FILESDIR}/configure.patch;patch=1 \
+	   file://${FILESDIR}/m4.patch;patch=1"
+
+inherit autotools 
+
+do_configure_prepend () {
+	touch NEWS README AUTHORS ChangeLog
+}
+
+do_stage () {
+	oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
+	oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
+}
diff --git a/apache/apache_2.0.48.oe b/apache/apache_2.0.48.oe
index 0cea2b45f8..dd5db4fda9 100644
--- a/apache/apache_2.0.48.oe
+++ b/apache/apache_2.0.48.oe
@@ -10,7 +10,7 @@ S = "${WORKDIR}/httpd-${PV}"
 basesysconfdir := "${sysconfdir}"
 sysconfdir = "/etc/apache"
 
-inherit autotools libtool
+inherit autotools 
 
 FILES_${PN}="${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
 	     ${libdir}/*/ ${basesysconfdir} ${sharedstatedir} ${localstatedir} \
diff --git a/apmd/apmd_3.2.0.oe b/apmd/apmd_3.2.0.oe
index 9b0df16523..e48678742f 100644
--- a/apmd/apmd_3.2.0.oe
+++ b/apmd/apmd_3.2.0.oe
@@ -1,7 +1,7 @@
 SECTION = "base"
 PRIORITY = "required"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "virtual/libc"
+DEPENDS = "virtual/libc libtool-cross"
 DESCRIPTION = "Set of tools for managing notebook power consumption."
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz;"
@@ -14,15 +14,8 @@ SRC_URI_append =" file://${FILESDIR}/make.patch;patch=1"
 
 S = "${WORKDIR}/apmd-${PV}.orig"
 
-inherit libtool
-
 do_compile() {
-	if [ -e ${STAGING_BINDIR}/${TARGET_SYS}-libtool ]; then
-	    LIBTOOL=${STAGING_BINDIR}/${TARGET_SYS}-libtool
-	else
-	    LIBTOOL=libtool
-	fi
-	oe_runmake "LIBTOOL=$LIBTOOL" apm apmd
+	oe_runmake "LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool" apm apmd
 }
 
 do_stage() {
diff --git a/atk/atk_1.2.0.oe b/atk/atk_1.2.0.oe
index 9768d9e5c8..c451b1585d 100644
--- a/atk/atk_1.2.0.oe
+++ b/atk/atk_1.2.0.oe
@@ -4,7 +4,7 @@ DESCRIPTION = "An accessibility toolkit for GNOME."
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/atk/1.2/atk-${PV}.tar.bz2 \
 	   file://${FILESDIR}/m4.patch;patch=1"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--disable-glibtest"
 
diff --git a/atk/atk_1.6.0.oe b/atk/atk_1.6.0.oe
index e69de29bb2..fb12c4dc25 100644
--- a/atk/atk_1.6.0.oe
+++ b/atk/atk_1.6.0.oe
@@ -0,0 +1,51 @@
+DEPENDS = "virtual/libc glib-2.0"
+DESCRIPTION = "An accessibility toolkit for GNOME."
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2 \
+	   file://${FILESDIR}/gtk-doc.patch;patch=1"
+
+inherit autotools  pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest"
+
+CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
+		  -I${STAGING_INCDIR}/glib-2.0/glib \
+	 	  -I${STAGING_INCDIR}/glib-2.0/gobject"
+
+SOV = "0.600.0"
+
+do_stage () {
+	oe_soinstall atk/.libs/libatk-1.0.so.${SOV} ${STAGING_LIBDIR}/
+	install -m 0755 atk/.libs/libatk-1.0.lai ${STAGING_LIBDIR}/libatk-1.0.la
+	install -m 0755 atk/.libs/libatk-1.0.a ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/atk
+	install -m 0644 atk/atkaction.h ${STAGING_INCDIR}/atk/atkaction.h
+	install -m 0644 atk/atkcomponent.h ${STAGING_INCDIR}/atk/atkcomponent.h
+	install -m 0644 atk/atkdocument.h ${STAGING_INCDIR}/atk/atkdocument.h
+	install -m 0644 atk/atkeditabletext.h ${STAGING_INCDIR}/atk/atkeditabletext.h
+	install -m 0644 atk/atk-enum-types.h ${STAGING_INCDIR}/atk/atk-enum-types.h
+	install -m 0644 atk/atkgobjectaccessible.h ${STAGING_INCDIR}/atk/atkgobjectaccessible.h
+	install -m 0644 atk/atk.h ${STAGING_INCDIR}/atk/atk.h
+	install -m 0644 atk/atkhyperlink.h ${STAGING_INCDIR}/atk/atkhyperlink.h
+	install -m 0644 atk/atkhypertext.h ${STAGING_INCDIR}/atk/atkhypertext.h
+	install -m 0644 atk/atkimage.h ${STAGING_INCDIR}/atk/atkimage.h
+	install -m 0644 atk/atknoopobjectfactory.h ${STAGING_INCDIR}/atk/atknoopobjectfactory.h
+	install -m 0644 atk/atknoopobject.h ${STAGING_INCDIR}/atk/atknoopobject.h
+	install -m 0644 atk/atkobjectfactory.h ${STAGING_INCDIR}/atk/atkobjectfactory.h
+	install -m 0644 atk/atkobject.h ${STAGING_INCDIR}/atk/atkobject.h
+	install -m 0644 atk/atkregistry.h ${STAGING_INCDIR}/atk/atkregistry.h
+	install -m 0644 atk/atkrelation.h ${STAGING_INCDIR}/atk/atkrelation.h
+	install -m 0644 atk/atkrelationset.h ${STAGING_INCDIR}/atk/atkrelationset.h
+	install -m 0644 atk/atkrelationtype.h ${STAGING_INCDIR}/atk/atkrelationtype.h
+	install -m 0644 atk/atkselection.h ${STAGING_INCDIR}/atk/atkselection.h
+	install -m 0644 atk/atkstate.h ${STAGING_INCDIR}/atk/atkstate.h
+	install -m 0644 atk/atkstateset.h ${STAGING_INCDIR}/atk/atkstateset.h
+	install -m 0644 atk/atkstreamablecontent.h ${STAGING_INCDIR}/atk/atkstreamablecontent.h
+	install -m 0644 atk/atktable.h ${STAGING_INCDIR}/atk/atktable.h
+	install -m 0644 atk/atktext.h ${STAGING_INCDIR}/atk/atktext.h
+	install -m 0644 atk/atkutil.h ${STAGING_INCDIR}/atk/atkutil.h
+	install -m 0644 atk/atkvalue.h ${STAGING_INCDIR}/atk/atkvalue.h
+}
diff --git a/audiofile/audiofile_0.2.6.oe b/audiofile/audiofile_0.2.6.oe
index f18a421a40..af4667b2fe 100644
--- a/audiofile/audiofile_0.2.6.oe
+++ b/audiofile/audiofile_0.2.6.oe
@@ -9,7 +9,7 @@ Research, Amiga IFF/8SVX, and NIST SPHERE."
 
 SRC_URI = "http://www.68k.org/~michael/audiofile/audiofile-${PV}.tar.gz"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_stage () {
 	install -m 0644 libaudiofile/audiofile.h libaudiofile/aupvlist.h libaudiofile/af_vfs.h ${STAGING_INCDIR}/
diff --git a/autoconf/autoconf-native_2.59.oe b/autoconf/autoconf-native_2.59.oe
index 82d17ce95f..658854136e 100644
--- a/autoconf/autoconf-native_2.59.oe
+++ b/autoconf/autoconf-native_2.59.oe
@@ -1,6 +1,5 @@
 include autoconf_${PV}.oe
 S = "${WORKDIR}/autoconf-${PV}"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/autoconf-${PV}"
-DEPENDS = "patcher-native"
 
 inherit native
diff --git a/automake/automake-native_1.8.2.oe b/automake/automake-native_1.8.2.oe
index 49a83a6a57..35e38018d7 100644
--- a/automake/automake-native_1.8.2.oe
+++ b/automake/automake-native_1.8.2.oe
@@ -1,6 +1,6 @@
 include automake_${PV}.oe
 S = "${WORKDIR}/automake-${PV}"
-DEPENDS = "autoconf-native patcher-native "
+DEPENDS = "autoconf-native"
 
 inherit native
 
diff --git a/bluez-hcidump/bluez-hcidump_1.5.oe b/bluez-hcidump/bluez-hcidump_1.5.oe
index 82c4ec6efa..38433943d6 100644
--- a/bluez-hcidump/bluez-hcidump_1.5.oe
+++ b/bluez-hcidump/bluez-hcidump_1.5.oe
@@ -9,4 +9,4 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz \
 
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR}/.."
 
-inherit autotools libtool
+inherit autotools 
diff --git a/bluez-libs/bluez-libs_2.4.oe b/bluez-libs/bluez-libs_2.4.oe
index bda4c084b2..16bb0c9cf6 100644
--- a/bluez-libs/bluez-libs_2.4.oe
+++ b/bluez-libs/bluez-libs_2.4.oe
@@ -7,7 +7,7 @@ DESCRIPTION = "Linux Bluetooth Stack Libaries."
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage () {
 	oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
diff --git a/bluez-pan/bluez-pan_1.1.oe b/bluez-pan/bluez-pan_1.1.oe
index 936f335476..d61cbc803c 100644
--- a/bluez-pan/bluez-pan_1.1.oe
+++ b/bluez-pan/bluez-pan_1.1.oe
@@ -8,4 +8,4 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-pan-${PV}.tar.gz"
 
 EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --with-sdp-libs=${STAGING_LIBDIR} --with-sdp-includes=${STAGING_INCDIR}"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/bluez-sdp/bluez-sdp_1.5.oe b/bluez-sdp/bluez-sdp_1.5.oe
index a5c9b9701b..7bd48be153 100644
--- a/bluez-sdp/bluez-sdp_1.5.oe
+++ b/bluez-sdp/bluez-sdp_1.5.oe
@@ -10,7 +10,7 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-sdp-${PV}.tar.gz"
 EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
 LDFLAGS_prepend = "-L${S}/libs "
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage () {
 	oe_libinstall -a -so -C libs libsdp ${STAGING_LIBDIR}
diff --git a/bluez-utils/bluez-utils_2.3.oe b/bluez-utils/bluez-utils_2.3.oe
index 6da58caa64..0bc09811d0 100644
--- a/bluez-utils/bluez-utils_2.3.oe
+++ b/bluez-utils/bluez-utils_2.3.oe
@@ -9,4 +9,4 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 
 EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/bochs/bochs_2.1.oe b/bochs/bochs_2.1.oe
index 06e72d7a12..44eccd5362 100644
--- a/bochs/bochs_2.1.oe
+++ b/bochs/bochs_2.1.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc libsdl-qpe"
 SRC_URI = "${SOURCEFORGE_MIRROR}/bochs/bochs-${PV}.tar.gz \
            file://${FILESDIR}/compile.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--without-x                 \
                 --without-x11               \
diff --git a/cairo/cairo-cvs.oe b/cairo/cairo-cvs.oe
index aa2265bb45..203e17162e 100644
--- a/cairo/cairo-cvs.oe
+++ b/cairo/cairo-cvs.oe
@@ -9,7 +9,7 @@ PROVIDES = "cairo"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=cairo"
 S = "${WORKDIR}/cairo"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
diff --git a/changedfiles/changedfiles-daemon_1.0-rc1.oe b/changedfiles/changedfiles-daemon_1.0-rc1.oe
index 3bb8d8e063..e2b32ca0ee 100644
--- a/changedfiles/changedfiles-daemon_1.0-rc1.oe
+++ b/changedfiles/changedfiles-daemon_1.0-rc1.oe
@@ -10,7 +10,7 @@ RDEPENDS = "fget"
 SRC_URI = "http://www.bangstate.com/changedfiles-${PV}.tar.gz"
 S = "${WORKDIR}/changedfiles-${PV}"
 
-inherit autotools libtool
+inherit autotools 
 
 do_configure() {
 	oe_runconf
diff --git a/clucene/clucene_0.8.9.oe b/clucene/clucene_0.8.9.oe
index d2cf9c0237..442973ad65 100644
--- a/clucene/clucene_0.8.9.oe
+++ b/clucene/clucene_0.8.9.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "${SOURCEFORGE_MIRROR}/clucene/clucene-${PV}-src.tar.gz"
 S = "${WORKDIR}/"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage() {
 	oe_libinstall -C src libclucene ${STAGING_LIBDIR}
diff --git a/console-tools/console-tools_0.3.2.oe b/console-tools/console-tools_0.3.2.oe
index 75cbe75afb..b9d09bc647 100644
--- a/console-tools/console-tools_0.3.2.oe
+++ b/console-tools/console-tools_0.3.2.oe
@@ -20,4 +20,4 @@ do_compile () {
 	oe_runmake 'SUBDIRS=${SUBDIRS}'
 }
 
-inherit autotools libtool
+inherit autotools 
diff --git a/coreutils/coreutils_5.0.oe b/coreutils/coreutils_5.0.oe
index 76c7b2910d..6113297249 100644
--- a/coreutils/coreutils_5.0.oe
+++ b/coreutils/coreutils_5.0.oe
@@ -6,3 +6,5 @@ SRC_URI = "${GNU_MIRROR}/coreutils/coreutils-${PV}.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
 inherit autotools
+
+export EXTRA_OEMAKE="'SUBDIRS=lib src doc m4 po tests' MAKEFLAGS="
diff --git a/coreutils/coreutils_5.1.3.oe b/coreutils/coreutils_5.1.3.oe
index 76b805e7db..2ab0cbdb73 100644
--- a/coreutils/coreutils_5.1.3.oe
+++ b/coreutils/coreutils_5.1.3.oe
@@ -5,3 +5,5 @@ SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
            file://${FILESDIR}/install-cross.patch;patch=1;pnum=0"
 
 inherit autotools
+
+export EXTRA_OEMAKE="'SUBDIRS=lib src doc m4 po tests' MAKEFLAGS="
diff --git a/cpufreqd/cpufreqd_1.1.2.oe b/cpufreqd/cpufreqd_1.1.2.oe
index 13112948b7..74242bf47c 100644
--- a/cpufreqd/cpufreqd_1.1.2.oe
+++ b/cpufreqd/cpufreqd_1.1.2.oe
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "${SOURCEFORGE_MIRROR}/cpufreqd/cpufreqd-${PV}.tar.gz \
 	   file://${FILESDIR}/nonrootinstall.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 FILES_${PN} = "${sbindir} ${sysconfdir} ${libdir}/libsys_*.so"
 FILES_${PN}-dev = "${libdir}/*.la ${libdir}/*.a"
diff --git a/curl/curl_7.10.8.oe b/curl/curl_7.10.8.oe
index 6e02b39d58..e3340f450e 100644
--- a/curl/curl_7.10.8.oe
+++ b/curl/curl_7.10.8.oe
@@ -4,7 +4,7 @@ client-side URL transfers."
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
 		--without-ssl --with-random=/dev/urandom"
diff --git a/curl/curl_7.11.0.oe b/curl/curl_7.11.0.oe
index 9b162a96bf..9de384cf82 100644
--- a/curl/curl_7.11.0.oe
+++ b/curl/curl_7.11.0.oe
@@ -4,7 +4,7 @@ client-side URL transfers."
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
 		--without-ssl --with-random=/dev/urandom"
diff --git a/cyrus-sasl/cyrus-sasl_2.1.17.oe b/cyrus-sasl/cyrus-sasl_2.1.17.oe
index e0fa2ffe03..cb6fcf9653 100644
--- a/cyrus-sasl/cyrus-sasl_2.1.17.oe
+++ b/cyrus-sasl/cyrus-sasl_2.1.17.oe
@@ -4,7 +4,7 @@ DESCRIPTION = "Generic client/server library for SASL authentication."
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 acpaths = "-I ${S}/cmulocal -I ${S}/config -I ."
 CFLAGS_append = " -I${S}/include -I${S}/saslauthd/include"
diff --git a/cyrus-sasl/cyrus-sasl_2.1.18.oe b/cyrus-sasl/cyrus-sasl_2.1.18.oe
index 1bf653d224..dde073051e 100644
--- a/cyrus-sasl/cyrus-sasl_2.1.18.oe
+++ b/cyrus-sasl/cyrus-sasl_2.1.18.oe
@@ -3,7 +3,7 @@ DESCRIPTION = "Generic client/server library for SASL authentication."
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 acpaths = "-I ${S}/cmulocal -I ${S}/config -I ."
 CFLAGS_append = " -I${S}/include -I${S}/saslauthd/include"
diff --git a/db/db3_3.2.9.oe b/db/db3_3.2.9.oe
index 3abd1ac80a..f4556daf44 100644
--- a/db/db3_3.2.9.oe
+++ b/db/db3_3.2.9.oe
@@ -5,7 +5,7 @@ SRC_URI = "http://www.sleepycat.com/update/snapshot/db-${PV}.tar.gz"
 S = "${WORKDIR}/db-${PV}/dist"
 B = "${WORKDIR}/db-${PV}/build_unix"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--enable-shared --enable-compat185 --enable-static"
 EXTRA_OEMAKE = "'SHELL=/bin/sh' 'ar=`which ${AR}` cr' 'chmod=`which chmod`' \
diff --git a/dbus/dbus_0.20.oe b/dbus/dbus_0.20.oe
index a40122b4af..04661a4815 100644
--- a/dbus/dbus_0.20.oe
+++ b/dbus/dbus_0.20.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc expat glib-2.0"
 SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://${FILESDIR}/cross.patch;patch=1"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
 		--disable-checks --disable-xml-docs --disable-doxygen-docs \
diff --git a/dbus/dbus_0.21.oe b/dbus/dbus_0.21.oe
index a40122b4af..04661a4815 100644
--- a/dbus/dbus_0.21.oe
+++ b/dbus/dbus_0.21.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc expat glib-2.0"
 SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://${FILESDIR}/cross.patch;patch=1"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
 		--disable-checks --disable-xml-docs --disable-doxygen-docs \
diff --git a/desktop-file-utils/desktop-file-utils_0.3.oe b/desktop-file-utils/desktop-file-utils_0.3.oe
index 7b870e1260..9795a76974 100644
--- a/desktop-file-utils/desktop-file-utils_0.3.oe
+++ b/desktop-file-utils/desktop-file-utils_0.3.oe
@@ -5,4 +5,4 @@ DEPENDS = "virtual/libc popt glib-2.0"
 SRC_URI = "http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz \
 	   file://${FILESDIR}/m4.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/dosbox/dosbox_0.61.oe b/dosbox/dosbox_0.61.oe
index 6749c37e0a..585fd2f85e 100644
--- a/dosbox/dosbox_0.61.oe
+++ b/dosbox/dosbox_0.61.oe
@@ -5,5 +5,5 @@ DEPENDS = "virtual/libc libsdl-qpe"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dosbox/dosbox-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
diff --git a/eet/eet_0.0.1.oe b/eet/eet_0.0.1.oe
index 34dc33cd83..9da68b73b8 100644
--- a/eet/eet_0.0.1.oe
+++ b/eet/eet_0.0.1.oe
@@ -7,4 +7,4 @@ random-access reading of the file later on."
 SRC_URI = "${SOURCEFORGE_MIRROR}/enlightenment/eet-${PV}.tar.gz \
 	   file://${FILESDIR}/flags.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/epeg/epeg.oe b/epeg/epeg.oe
index 17ebb18a4a..7f61e9c571 100644
--- a/epeg/epeg.oe
+++ b/epeg/epeg.oe
@@ -5,4 +5,4 @@ DESCRIPTION = "Epeg is a small library for handling thumbnails."
 SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/epeg"
 S = "${WORKDIR}/epeg"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/esound/esound-gpe_cvs.oe b/esound/esound-gpe_cvs.oe
index 313e80350c..eb3bbd74ea 100644
--- a/esound/esound-gpe_cvs.oe
+++ b/esound/esound-gpe_cvs.oe
@@ -1,7 +1,7 @@
 SRC_URI = "cvs://anoncvs@cvs.handhelds.org/cvs;module=gpe/base/esound"
 S = "${WORKDIR}/esound"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage () {
 	install -m 0644 esd.h ${STAGING_INCDIR}/esd.h
diff --git a/evas/evas_1.0.0-pre5.oe b/evas/evas_1.0.0-pre5.oe
index eb0aa3e110..1e3fa6ee99 100644
--- a/evas/evas_1.0.0-pre5.oe
+++ b/evas/evas_1.0.0-pre5.oe
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/enlightenment/evas-1.0.0_pre5.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1"
 S = "${WORKDIR}/evas-1.0.0_pre5"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--enable-fb \
 		--enable-image-loader-png \
diff --git a/expat/expat_1.95.6.oe b/expat/expat_1.95.6.oe
index ae13e5da14..eaed6fb5f6 100644
--- a/expat/expat_1.95.6.oe
+++ b/expat/expat_1.95.6.oe
@@ -4,7 +4,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz"
 S = "${WORKDIR}/expat-${PV}"
 
-inherit autotools libtool
+inherit autotools 
 export LTCC = "${CC}"
 
 do_stage () {
diff --git a/expat/expat_1.95.7.oe b/expat/expat_1.95.7.oe
index b3e8125ca7..05abd25fb8 100644
--- a/expat/expat_1.95.7.oe
+++ b/expat/expat_1.95.7.oe
@@ -4,7 +4,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz"
 S = "${WORKDIR}/expat-${PV}"
 
-inherit autotools libtool lib_package
+inherit autotools  lib_package
 export LTCC = "${CC}"
 
 do_stage () {
diff --git a/fakeroot/fakeroot_0.8.5.oe b/fakeroot/fakeroot_0.8.5.oe
index 9ac5070470..fea4cbcfbd 100644
--- a/fakeroot/fakeroot_0.8.5.oe
+++ b/fakeroot/fakeroot_0.8.5.oe
@@ -3,4 +3,4 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/fakeroot/fakeroot_0.9.0.oe b/fakeroot/fakeroot_0.9.0.oe
index 9ac5070470..fea4cbcfbd 100644
--- a/fakeroot/fakeroot_0.9.0.oe
+++ b/fakeroot/fakeroot_0.9.0.oe
@@ -3,4 +3,4 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/fam/fam_2.6.10.oe b/fam/fam_2.6.10.oe
index 3dbcfd43c3..ce0ff357a4 100644
--- a/fam/fam_2.6.10.oe
+++ b/fam/fam_2.6.10.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "ftp://oss.sgi.com/projects/fam/download/stable/fam-${PV}.tar.gz \
 	   file://${FILESDIR}/rpcsvc.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 CPPFLAGS_append = " -DNDEBUG"
 
diff --git a/fam/fam_2.7.0.oe b/fam/fam_2.7.0.oe
index 74f7899306..3181c3af21 100644
--- a/fam/fam_2.7.0.oe
+++ b/fam/fam_2.7.0.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "ftp://oss.sgi.com/projects/fam/download/stable/fam-${PV}.tar.gz \
 	   file://${FILESDIR}/compile-fix.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 CPPFLAGS_append = " -DNDEBUG"
 
diff --git a/fdclock/fdclock-cvs.oe b/fdclock/fdclock-cvs.oe
index 1893f4fdb2..1d33ee85c8 100644
--- a/fdclock/fdclock-cvs.oe
+++ b/fdclock/fdclock-cvs.oe
@@ -9,4 +9,4 @@ PROVIDES = "fdclock"
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=fdclock"
 S = "${WORKDIR}/fdclock"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/fget/fget_1.2.9.oe b/fget/fget_1.2.9.oe
index 8eb9108443..4b154aa3a6 100644
--- a/fget/fget_1.2.9.oe
+++ b/fget/fget_1.2.9.oe
@@ -9,7 +9,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "ftp://ftp-dev.cites.uiuc.edu/pub/fget/fget-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_configure() {
 	oe_runconf
diff --git a/file/file_3.41.oe b/file/file_3.41.oe
index 1bac5dc4bd..79038d9196 100644
--- a/file/file_3.41.oe
+++ b/file/file_3.41.oe
@@ -5,4 +5,4 @@ on their contents and prints a description if a match is found."
 SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
 	   file://${FILESDIR}/fileexec.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/file/file_4.06.oe b/file/file_4.06.oe
index 1bac5dc4bd..79038d9196 100644
--- a/file/file_4.06.oe
+++ b/file/file_4.06.oe
@@ -5,4 +5,4 @@ on their contents and prints a description if a match is found."
 SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
 	   file://${FILESDIR}/fileexec.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/flite/flite_1.2.oe b/flite/flite_1.2.oe
index 48cf4e5461..e2951054f1 100644
--- a/flite/flite_1.2.oe
+++ b/flite/flite_1.2.oe
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2"
 S = "${WORKDIR}/flite-${PV}-release"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--enable-shared"
 
diff --git a/fontconfig/fontconfig_2.2.92.oe b/fontconfig/fontconfig_2.2.92.oe
index 495b2a1cc6..54f89eba58 100644
--- a/fontconfig/fontconfig_2.2.92.oe
+++ b/fontconfig/fontconfig_2.2.92.oe
@@ -10,7 +10,7 @@ SRC_URI = "http://pdx.freedesktop.org/~fontconfig/release/fontconfig-${PV}.tar.g
 
 S = "${WORKDIR}/fontconfig-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = " --disable-docs "
 
diff --git a/freedroid/freedroid_1.0.2.oe b/freedroid/freedroid_1.0.2.oe
index a8eb4409bf..5d92091ae2 100644
--- a/freedroid/freedroid_1.0.2.oe
+++ b/freedroid/freedroid_1.0.2.oe
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libc virtual/libqpe virtual/libsdl libsdl-image"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freedroid/freedroid-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_compile() {
 	oe_runmake pkgdatadir=${palmtopdir}/share/freedroid
diff --git a/freetype/freetype_2.1.7.oe b/freetype/freetype_2.1.7.oe
index c002dff23c..71c3c8e5ed 100644
--- a/freetype/freetype_2.1.7.oe
+++ b/freetype/freetype_2.1.7.oe
@@ -4,7 +4,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
diff --git a/gaim/gaim_0.77.oe b/gaim/gaim_0.77.oe
index e69de29bb2..74df2a43aa 100644
--- a/gaim/gaim_0.77.oe
+++ b/gaim/gaim_0.77.oe
@@ -0,0 +1,10 @@
+DESCRIPTION = "multi-protocol instant messaging client"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2"
+
+EXTRA_OECONF = "--disable-audio --disable-perl --disable-tcl --disable-deprecated"
+
+inherit autotools 
diff --git a/gdbm/gdbm_1.8.3.oe b/gdbm/gdbm_1.8.3.oe
index 8a1e043e70..9b12b0120f 100644
--- a/gdbm/gdbm_1.8.3.oe
+++ b/gdbm/gdbm_1.8.3.oe
@@ -7,7 +7,7 @@ that use extensible hashing."
 SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
 	   file://${FILESDIR}/makefile.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage () {
 	oe_libinstall -so -a libgdbm ${STAGING_LIBDIR}
diff --git a/gettext/gettext_0.14.1.oe b/gettext/gettext_0.14.1.oe
index e69de29bb2..7e015a38f3 100644
--- a/gettext/gettext_0.14.1.oe
+++ b/gettext/gettext_0.14.1.oe
@@ -0,0 +1,13 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+LICENSE = GPL
+DESCRIPTION = The GNU internationalization library.
+
+SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
+	   file://${FILESDIR}/gettext-vpath.patch;patch=1;pnum=1"
+
+inherit autotools 
+
+acpaths = '-I ${S}/autoconf-lib-link/m4/ \
+	   -I ${S}/gettext-runtime/m4 \
+	   -I ${S}/gettext-tools/m4'
diff --git a/gif2png/gif2png_2.5.1.oe b/gif2png/gif2png_2.5.1.oe
index f1c005ef95..5d9f681425 100644
--- a/gif2png/gif2png_2.5.1.oe
+++ b/gif2png/gif2png_2.5.1.oe
@@ -5,5 +5,5 @@ DEPENDS = "virtual/libc base/zlib libpng"
 
 SRC_URI = "http://www.catb.org/~esr/gif2png/gif2png-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
diff --git a/gift/gift_0.11.4.oe b/gift/gift_0.11.4.oe
index 1786052740..89f0494811 100644
--- a/gift/gift_0.11.4.oe
+++ b/gift/gift_0.11.4.oe
@@ -6,7 +6,7 @@ FILES_gift_append = " ${datadir}/giFT"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--with-vorbis-libraries=${STAGING_LIBDIR} \
 		--with-vorbis-includes=${STAGING_INCDIR}"
diff --git a/gift/gift_0.11.5.oe b/gift/gift_0.11.5.oe
index 1786052740..89f0494811 100644
--- a/gift/gift_0.11.5.oe
+++ b/gift/gift_0.11.5.oe
@@ -6,7 +6,7 @@ FILES_gift_append = " ${datadir}/giFT"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--with-vorbis-libraries=${STAGING_LIBDIR} \
 		--with-vorbis-includes=${STAGING_INCDIR}"
diff --git a/glib-2.0/glib-2.0-native_2.2.3.oe b/glib-2.0/glib-2.0-native_2.2.3.oe
index e3a38ad5f2..bc8b8177a5 100644
--- a/glib-2.0/glib-2.0-native_2.2.3.oe
+++ b/glib-2.0/glib-2.0-native_2.2.3.oe
@@ -5,7 +5,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \
 	   file://${FILESDIR}/automake-lossage.patch;patch=1"
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools libtool native
+inherit autotools  native
 
 acpaths = ""
 do_configure_prepend () {
diff --git a/glib-2.0/glib-2.0-native_2.4.1.oe b/glib-2.0/glib-2.0-native_2.4.1.oe
index e69de29bb2..2d3546afb1 100644
--- a/glib-2.0/glib-2.0-native_2.4.1.oe
+++ b/glib-2.0/glib-2.0-native_2.4.1.oe
@@ -0,0 +1,115 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+
+EXTRA_OECONF = "--disable-debug"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glib-2.0-${PV}"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
+	   file://${FILESDIR}/glibconfig-sysdefs.h \
+	   file://${FILESDIR}/gtk-doc.patch;patch=1"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools  pkgconfig native
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h .
+}
+
+SOV = "0.400.1"
+do_stage () {
+	oe_soinstall glib/.libs/libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/
+	oe_soinstall gmodule/.libs/libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/
+	oe_soinstall gthread/.libs/libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/
+	oe_soinstall gobject/.libs/libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/
+	install -m 0644 glib/.libs/libglib-2.0.lai ${STAGING_LIBDIR}/libglib-2.0.la
+	#install -m 0644 glib/.libs/libglib-2.0.a ${STAGING_LIBDIR}/libglib-2.0.a
+	install -m 0644 gmodule/.libs/libgmodule-2.0.lai ${STAGING_LIBDIR}/libgmodule-2.0.la
+	#install -m 0644 gmodule/.libs/libgmodule-2.0.a ${STAGING_LIBDIR}/libgmodule-2.0.a
+	install -m 0644 gthread/.libs/libgthread-2.0.lai ${STAGING_LIBDIR}/libgthread-2.0.la
+	#install -m 0644 gthread/.libs/libgthread-2.0.a ${STAGING_LIBDIR}/libgthread-2.0.a
+	install -m 0644 gobject/.libs/libgobject-2.0.lai ${STAGING_LIBDIR}/libgobject-2.0.la
+	#install -m 0644 gobject/.libs/libgobject-2.0.a ${STAGING_LIBDIR}/libgobject-2.0.a
+	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+	install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h
+	install -m 0644 ${S}/glib/glib.h ${STAGING_INCDIR}/glib-2.0/glib.h
+	install -m 0644 ${S}/gmodule/gmodule.h ${STAGING_INCDIR}/glib-2.0/gmodule.h
+	install -m 0644 ${S}/glib/galloca.h ${STAGING_INCDIR}/glib-2.0/glib/galloca.h
+	install -m 0644 ${S}/glib/gatomic.h ${STAGING_INCDIR}/glib-2.0/glib/gatomic.h
+	install -m 0644 ${S}/glib/garray.h ${STAGING_INCDIR}/glib-2.0/glib/garray.h
+	install -m 0644 ${S}/glib/gasyncqueue.h ${STAGING_INCDIR}/glib-2.0/glib/gasyncqueue.h
+	install -m 0644 ${S}/glib/gbacktrace.h ${STAGING_INCDIR}/glib-2.0/glib/gbacktrace.h
+	install -m 0644 ${S}/glib/gcache.h ${STAGING_INCDIR}/glib-2.0/glib/gcache.h
+	install -m 0644 ${S}/glib/gcompletion.h ${STAGING_INCDIR}/glib-2.0/glib/gcompletion.h
+	install -m 0644 ${S}/glib/gconvert.h ${STAGING_INCDIR}/glib-2.0/glib/gconvert.h
+	install -m 0644 ${S}/glib/gdataset.h ${STAGING_INCDIR}/glib-2.0/glib/gdataset.h
+	install -m 0644 ${S}/glib/gdate.h ${STAGING_INCDIR}/glib-2.0/glib/gdate.h
+	install -m 0644 ${S}/glib/gdir.h ${STAGING_INCDIR}/glib-2.0/glib/gdir.h
+	install -m 0644 ${S}/glib/gerror.h ${STAGING_INCDIR}/glib-2.0/glib/gerror.h
+	install -m 0644 ${S}/glib/gfileutils.h ${STAGING_INCDIR}/glib-2.0/glib/gfileutils.h
+	install -m 0644 ${S}/glib/ghash.h ${STAGING_INCDIR}/glib-2.0/glib/ghash.h
+	install -m 0644 ${S}/glib/ghook.h ${STAGING_INCDIR}/glib-2.0/glib/ghook.h
+	install -m 0644 ${S}/glib/giochannel.h ${STAGING_INCDIR}/glib-2.0/glib/giochannel.h
+	install -m 0644 ${S}/glib/glist.h ${STAGING_INCDIR}/glib-2.0/glib/glist.h
+	install -m 0644 ${S}/glib/gmacros.h ${STAGING_INCDIR}/glib-2.0/glib/gmacros.h
+	install -m 0644 ${S}/glib/gmain.h ${STAGING_INCDIR}/glib-2.0/glib/gmain.h
+	install -m 0644 ${S}/glib/gmarkup.h ${STAGING_INCDIR}/glib-2.0/glib/gmarkup.h
+	install -m 0644 ${S}/glib/gmem.h ${STAGING_INCDIR}/glib-2.0/glib/gmem.h
+	install -m 0644 ${S}/glib/gmessages.h ${STAGING_INCDIR}/glib-2.0/glib/gmessages.h
+	install -m 0644 ${S}/glib/gnode.h ${STAGING_INCDIR}/glib-2.0/glib/gnode.h
+	install -m 0644 ${S}/glib/gpattern.h ${STAGING_INCDIR}/glib-2.0/glib/gpattern.h
+	install -m 0644 ${S}/glib/gprimes.h ${STAGING_INCDIR}/glib-2.0/glib/gprimes.h
+	install -m 0644 ${S}/glib/gqsort.h ${STAGING_INCDIR}/glib-2.0/glib/gqsort.h
+	install -m 0644 ${S}/glib/gquark.h ${STAGING_INCDIR}/glib-2.0/glib/gquark.h
+	install -m 0644 ${S}/glib/gqueue.h ${STAGING_INCDIR}/glib-2.0/glib/gqueue.h
+	install -m 0644 ${S}/glib/grand.h ${STAGING_INCDIR}/glib-2.0/glib/grand.h
+	install -m 0644 ${S}/glib/grel.h ${STAGING_INCDIR}/glib-2.0/glib/grel.h
+	install -m 0644 ${S}/glib/gscanner.h ${STAGING_INCDIR}/glib-2.0/glib/gscanner.h
+	install -m 0644 ${S}/glib/gshell.h ${STAGING_INCDIR}/glib-2.0/glib/gshell.h
+	install -m 0644 ${S}/glib/gslist.h ${STAGING_INCDIR}/glib-2.0/glib/gslist.h
+	install -m 0644 ${S}/glib/gspawn.h ${STAGING_INCDIR}/glib-2.0/glib/gspawn.h
+	install -m 0644 ${S}/glib/gstrfuncs.h ${STAGING_INCDIR}/glib-2.0/glib/gstrfuncs.h
+	install -m 0644 ${S}/glib/gstring.h ${STAGING_INCDIR}/glib-2.0/glib/gstring.h
+	install -m 0644 ${S}/glib/gthread.h ${STAGING_INCDIR}/glib-2.0/glib/gthread.h
+	install -m 0644 ${S}/glib/gthreadpool.h ${STAGING_INCDIR}/glib-2.0/glib/gthreadpool.h
+	install -m 0644 ${S}/glib/gtimer.h ${STAGING_INCDIR}/glib-2.0/glib/gtimer.h
+	install -m 0644 ${S}/glib/gtree.h ${STAGING_INCDIR}/glib-2.0/glib/gtree.h
+	install -m 0644 ${S}/glib/gtypes.h ${STAGING_INCDIR}/glib-2.0/glib/gtypes.h
+	install -m 0644 ${S}/glib/gunicode.h ${STAGING_INCDIR}/glib-2.0/glib/gunicode.h
+	install -m 0644 ${S}/glib/gutils.h ${STAGING_INCDIR}/glib-2.0/glib/gutils.h
+	install -m 0644 ${S}/glib/gwin32.h ${STAGING_INCDIR}/glib-2.0/glib/gwin32.h
+	install -m 0644 ${S}/glib/gprintf.h ${STAGING_INCDIR}/glib-2.0/glib/gprintf.h
+	install -d ${STAGING_INCDIR}/glib-2.0/gobject
+	install -m 0644 ${S}/gobject/gboxed.h ${STAGING_INCDIR}/glib-2.0/gobject/gboxed.h
+	install -m 0644 ${S}/gobject/gclosure.h ${STAGING_INCDIR}/glib-2.0/gobject/gclosure.h
+	install -m 0644 ${S}/gobject/genums.h ${STAGING_INCDIR}/glib-2.0/gobject/genums.h
+	install -m 0644 ${S}/gobject/gobject.h ${STAGING_INCDIR}/glib-2.0/gobject/gobject.h
+	install -m 0644 ${S}/gobject/gparam.h ${STAGING_INCDIR}/glib-2.0/gobject/gparam.h
+	install -m 0644 ${S}/gobject/gparamspecs.h ${STAGING_INCDIR}/glib-2.0/gobject/gparamspecs.h
+	install -m 0644 ${S}/gobject/gsignal.h ${STAGING_INCDIR}/glib-2.0/gobject/gsignal.h
+	install -m 0644 ${S}/gobject/gsourceclosure.h ${STAGING_INCDIR}/glib-2.0/gobject/gsourceclosure.h
+	install -m 0644 ${S}/gobject/gtype.h ${STAGING_INCDIR}/glib-2.0/gobject/gtype.h
+	install -m 0644 ${S}/gobject/gtypemodule.h ${STAGING_INCDIR}/glib-2.0/gobject/gtypemodule.h
+	install -m 0644 ${S}/gobject/gtypeplugin.h ${STAGING_INCDIR}/glib-2.0/gobject/gtypeplugin.h
+	install -m 0644 ${S}/gobject/gvalue.h ${STAGING_INCDIR}/glib-2.0/gobject/gvalue.h
+	install -m 0644 ${S}/gobject/gvaluearray.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluearray.h
+	install -m 0644 ${S}/gobject/gvaluecollector.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluecollector.h
+	install -m 0644 ${S}/gobject/gvaluetypes.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluetypes.h
+	install -m 0644 ${S}/gobject/gobjectnotifyqueue.c ${STAGING_INCDIR}/glib-2.0/gobject/gobjectnotifyqueue.c
+	install -m 0644 ${S}/gobject/gmarshal.h ${STAGING_INCDIR}/glib-2.0/gobject/gmarshal.h
+	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/
+	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+do_install () {
+	:
+}
diff --git a/glib-2.0/glib-2.0_2.2.3.oe b/glib-2.0/glib-2.0_2.2.3.oe
index 99a9feeb24..e98409bd71 100644
--- a/glib-2.0/glib-2.0_2.2.3.oe
+++ b/glib-2.0/glib-2.0_2.2.3.oe
@@ -13,7 +13,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 acpaths = ""
 do_configure_prepend () {
diff --git a/glib-2.0/glib-2.0_2.4.1.oe b/glib-2.0/glib-2.0_2.4.1.oe
index df7b0d7db8..219e89a1f8 100644
--- a/glib-2.0/glib-2.0_2.4.1.oe
+++ b/glib-2.0/glib-2.0_2.4.1.oe
@@ -16,7 +16,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 acpaths = ""
 do_configure_prepend () {
diff --git a/gmp/gmp_4.1.2.oe b/gmp/gmp_4.1.2.oe
index efca7421bb..ef77f237c1 100644
--- a/gmp/gmp_4.1.2.oe
+++ b/gmp/gmp_4.1.2.oe
@@ -4,7 +4,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "ftp://mirrors.kernel.org/gnu/gmp/gmp-${PV}.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 acpaths = ""
 
diff --git a/gnome/libidl_0.8.3.oe b/gnome/libidl_0.8.3.oe
index 5e3095a500..d5ecc0dd68 100644
--- a/gnome/libidl_0.8.3.oe
+++ b/gnome/libidl_0.8.3.oe
@@ -8,7 +8,7 @@ FILES_${PN}-dev += " ${bindir}"
 
 S = "${WORKDIR}/libIDL-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/gnome/orbit2_2.10.2.oe b/gnome/orbit2_2.10.2.oe
index e2f2f02ea7..6c90630ab3 100644
--- a/gnome/orbit2_2.10.2.oe
+++ b/gnome/orbit2_2.10.2.oe
@@ -7,7 +7,7 @@ DEPENDS = "libidl popt orbit2-native"
 
 S = "${WORKDIR}/ORBit2-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_compile() {
 	oe_runmake IDL_COMPILER="`which orbit-idl-2`"
diff --git a/gsl/gsl_1.4.oe b/gsl/gsl_1.4.oe
index 9af8422688..bde4173443 100644
--- a/gsl/gsl_1.4.oe
+++ b/gsl/gsl_1.4.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "http://www.mirror.ac.uk/sites/sources.redhat.com/pub/gsl/gsl-${PV}.tar.gz"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_stage() {
 	oe_runmake DESTDIR=${S}/.install install
diff --git a/gstreamer/gst-plugins_0.8.0.oe b/gstreamer/gst-plugins_0.8.0.oe
index 9a4f4c2d24..b466857bde 100644
--- a/gstreamer/gst-plugins_0.8.0.oe
+++ b/gstreamer/gst-plugins_0.8.0.oe
@@ -9,7 +9,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-0.8.0.ta
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"
 
diff --git a/gstreamer/gstreamer_0.8.0.oe b/gstreamer/gstreamer_0.8.0.oe
index 86bafee9a4..f394a86b0a 100644
--- a/gstreamer/gstreamer_0.8.0.oe
+++ b/gstreamer/gstreamer_0.8.0.oe
@@ -8,7 +8,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.8.0.tar.bz
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe
index 349f170dd5..4cc114e83a 100644
--- a/gtk+/gtk+_2.2.4.oe
+++ b/gtk+/gtk+_2.2.4.oe
@@ -14,7 +14,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.2/gtk+-${PV}.tar.bz2 \
 	   file://${FILESDIR}/libtool-lossage.patch;patch=1;pnum=0 \
 	   file://${FILESDIR}/no-xwc.patch;patch=1;pnum=0"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_configure_prepend() {
 	install -d m4
diff --git a/gtk+/gtk+_2.4.1.oe b/gtk+/gtk+_2.4.1.oe
index 7b0869bb6d..f73c533d3c 100644
--- a/gtk+/gtk+_2.4.1.oe
+++ b/gtk+/gtk+_2.4.1.oe
@@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
 	   file://${FILESDIR}/gtk-doc.m4 \
 	   file://${FILESDIR}/gtk+-handhelds.patch;patch=1"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_configure_prepend() {
 	install -d m4
diff --git a/httppc/httppc_0.8.5.oe b/httppc/httppc_0.8.5.oe
index 07a41f5023..b839825819 100644
--- a/httppc/httppc_0.8.5.oe
+++ b/httppc/httppc_0.8.5.oe
@@ -8,4 +8,4 @@ DNS resolution."
 SRC_URI = "${SOURCEFORGE_MIRROR}/httppc/httppc-${PV}.tar.gz \
 	   file://${FILESDIR}/install.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/ice/ice-cvs.oe b/ice/ice-cvs.oe
index e69de29bb2..11aaf4ceb2 100644
--- a/ice/ice-cvs.oe
+++ b/ice/ice-cvs.oe
@@ -0,0 +1,16 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libc 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/intltool/intltool_0.30.oe b/intltool/intltool_0.30.oe
index 29af8fc959..c563b9e714 100644
--- a/intltool/intltool_0.30.oe
+++ b/intltool/intltool_0.30.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/intltool/${PV}/intltool-${PV}.tar.bz2"
 S = "${WORKDIR}/intltool-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_stage() {
 	install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
diff --git a/ipkg/ipkg_0.99.121.oe b/ipkg/ipkg_0.99.121.oe
index de288e59b2..12fef2f69d 100644
--- a/ipkg/ipkg_0.99.121.oe
+++ b/ipkg/ipkg_0.99.121.oe
@@ -13,7 +13,7 @@ AUTO_LIBNAME_PKGS = "libipkg"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')}"
 S = "${WORKDIR}/ipkg/C"
 
-inherit autotools libtool
+inherit autotools 
 
 pkg_postinst_ipkg () {
 #!/bin/sh
diff --git a/irda-utils/irda-utils_0.9.15.oe b/irda-utils/irda-utils_0.9.15.oe
index e6ab2dba11..2a12bfbb16 100644
--- a/irda-utils/irda-utils_0.9.15.oe
+++ b/irda-utils/irda-utils_0.9.15.oe
@@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1 \
 	   file://${FILESDIR}/m4.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 do_compile () {
 	oe_runmake -e -C irattach
diff --git a/jack/jack_0.92.0.oe b/jack/jack_0.92.0.oe
index 756b9f3538..8166e76b22 100644
--- a/jack/jack_0.92.0.oe
+++ b/jack/jack_0.92.0.oe
@@ -11,6 +11,6 @@ themselves."
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/jackit/jack-audio-connection-kit-${PV}.tar.gz"
 S = "${WORKDIR}/jack-audio-connection-kit-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = ""
diff --git a/jack/jack_0.94.0.oe b/jack/jack_0.94.0.oe
index 756b9f3538..8166e76b22 100644
--- a/jack/jack_0.94.0.oe
+++ b/jack/jack_0.94.0.oe
@@ -11,6 +11,6 @@ themselves."
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/jackit/jack-audio-connection-kit-${PV}.tar.gz"
 S = "${WORKDIR}/jack-audio-connection-kit-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = ""
diff --git a/jpeg/jpeg_6b.oe b/jpeg/jpeg_6b.oe
index acebca58b8..bdaff21161 100644
--- a/jpeg/jpeg_6b.oe
+++ b/jpeg/jpeg_6b.oe
@@ -10,7 +10,7 @@ SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	   file://${FILESDIR}/debian.patch;patch=1 \
 	   file://${FILESDIR}/ldflags.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF="--enable-static --enable-shared"
 
diff --git a/libao/libao_0.8.4.oe b/libao/libao_0.8.4.oe
index c0ffa05e91..f67775d2aa 100644
--- a/libao/libao_0.8.4.oe
+++ b/libao/libao_0.8.4.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "http://www.xiph.org/ao/src/libao-${PV}.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--disable-esd --disable-esdtest \
 		--disable-alsa --disable-alsa09 \
diff --git a/libdaemon/libdaemon_0.3.oe b/libdaemon/libdaemon_0.3.oe
index a579ec1865..ece7bca4ab 100644
--- a/libdaemon/libdaemon_0.3.oe
+++ b/libdaemon/libdaemon_0.3.oe
@@ -3,7 +3,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--disable-lynx"
 
diff --git a/libesmtp/libesmtp_1.0.1.oe b/libesmtp/libesmtp_1.0.1.oe
index f7b29f3831..64e4ca32c4 100644
--- a/libesmtp/libesmtp_1.0.1.oe
+++ b/libesmtp/libesmtp_1.0.1.oe
@@ -7,7 +7,7 @@ FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
 SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2  \
            file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
 
diff --git a/libetpan/libetpan_0.33pre.oe b/libetpan/libetpan_0.33pre.oe
index ea99afe276..95365d82d7 100644
--- a/libetpan/libetpan_0.33pre.oe
+++ b/libetpan/libetpan_0.33pre.oe
@@ -12,7 +12,7 @@ SRC_URI = "http://www.alwins-world.de/oe/libetpan-${PV}.tar.bz2  \
            file://${FILESDIR}/config_iconv.patch;patch=1" \
            file://${FILESDIR}/includedir.patch;patch=1;pnum=0"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. --disable-db --prefix=${TARGET_DIR}"
 
diff --git a/libgcrypt/libgcrypt_1.1.91.oe b/libgcrypt/libgcrypt_1.1.91.oe
index a4fa79d549..59bdc13a98 100644
--- a/libgcrypt/libgcrypt_1.1.91.oe
+++ b/libgcrypt/libgcrypt_1.1.91.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc libgpg-error"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/libgcrypt-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--without-pth"
 
diff --git a/libglade/libglade_2.0.1.oe b/libglade/libglade_2.0.1.oe
index 89bbcff35a..1078e128e6 100644
--- a/libglade/libglade_2.0.1.oe
+++ b/libglade/libglade_2.0.1.oe
@@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-${PV}.tar.bz2 \
 	   file://${FILESDIR}/glade-cruft.patch;patch=1;pnum=0"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
 
diff --git a/libgpg-error/libgpg-error_0.6.oe b/libgpg-error/libgpg-error_0.6.oe
index 63e7edfe74..e4734d87d7 100644
--- a/libgpg-error/libgpg-error_0.6.oe
+++ b/libgpg-error/libgpg-error_0.6.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage() {
 	oe_libinstall -so -C src libgpg-error ${STAGING_LIBDIR}
diff --git a/libgpg-error/libgpg-error_0.7.oe b/libgpg-error/libgpg-error_0.7.oe
index 3438710a04..583c9e0ee7 100644
--- a/libgpg-error/libgpg-error_0.7.oe
+++ b/libgpg-error/libgpg-error_0.7.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage() {
 	oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR}
diff --git a/libid3tag/libid3tag_0.15.0b.oe b/libid3tag/libid3tag_0.15.0b.oe
index 63060eb85f..d11d4aafe9 100644
--- a/libid3tag/libid3tag_0.15.0b.oe
+++ b/libid3tag/libid3tag_0.15.0b.oe
@@ -7,7 +7,7 @@ DESCRIPTION = "Library for interacting with ID3 tags."
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz "
 S = "${WORKDIR}/libid3tag-${PV}"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "-enable-speed"
 
diff --git a/libidl/libidl_0.8.2.oe b/libidl/libidl_0.8.2.oe
index e69de29bb2..8b4f0fe601 100644
--- a/libidl/libidl_0.8.2.oe
+++ b/libidl/libidl_0.8.2.oe
@@ -0,0 +1,9 @@
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2"
+S = "${WORKDIR}/libIDL-${PV}"
+
+inherit autotools  pkgconfig
+
+do_stage () {
+	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
+
diff --git a/libmad/libmad_0.15.0b.oe b/libmad/libmad_0.15.0b.oe
index e4081d4f76..81b61be512 100644
--- a/libmad/libmad_0.15.0b.oe
+++ b/libmad/libmad_0.15.0b.oe
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libc libid3tag"
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz"
 S = "${WORKDIR}/libmad-${PV}"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "-enable-speed --enable-shared"
 
diff --git a/libmatchbox/libmatchbox_1.1.oe b/libmatchbox/libmatchbox_1.1.oe
index 7db7fa7dfa..4cdd4b0453 100644
--- a/libmatchbox/libmatchbox_1.1.oe
+++ b/libmatchbox/libmatchbox_1.1.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc x11 xext xft pango jpeg libpng zlib"
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2"
 S = "${WORKDIR}/libmatchbox-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--enable-jpeg --enable-pango"
 
diff --git a/libmatchbox/libmatchbox_1.2.oe b/libmatchbox/libmatchbox_1.2.oe
index 7db7fa7dfa..4cdd4b0453 100644
--- a/libmatchbox/libmatchbox_1.2.oe
+++ b/libmatchbox/libmatchbox_1.2.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc x11 xext xft pango jpeg libpng zlib"
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2"
 S = "${WORKDIR}/libmatchbox-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--enable-jpeg --enable-pango"
 
diff --git a/libmikey/libmikey_0.1a.oe b/libmikey/libmikey_0.1a.oe
index 97e81b24d2..5cd85598b5 100644
--- a/libmikey/libmikey_0.1a.oe
+++ b/libmikey/libmikey_0.1a.oe
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libc openssl"
 SRC_URI = "http://minisip.org/source/libmikey-${PV}.tar.gz"
 S = "${WORKDIR}/libmikey-0.1"
 
-inherit autotools libtool
+inherit autotools 
 
 do_configure() {
 	oe_runconf
diff --git a/libmikmod/libmikmod_3.1.11.oe b/libmikmod/libmikmod_3.1.11.oe
index 91e8f095ca..215a24be8d 100644
--- a/libmikmod/libmikmod_3.1.11.oe
+++ b/libmikmod/libmikmod_3.1.11.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--disable-af --disable-alsa --disable-esd \
 --enable-oss --disable-sam9407 --disable-ultra \
diff --git a/libmikmod/libmikmod_3.2.0-beta2.oe b/libmikmod/libmikmod_3.2.0-beta2.oe
index b86cd19105..e21cd41c1a 100644
--- a/libmikmod/libmikmod_3.2.0-beta2.oe
+++ b/libmikmod/libmikmod_3.2.0-beta2.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--disable-af --disable-alsa --disable-esd \
 --enable-oss --disable-sam9407 --disable-ultra \
diff --git a/libmimedir/libmimedir_0.0-20040307.oe b/libmimedir/libmimedir_0.0-20040307.oe
index 5f1e4a9a4c..f4d9962e9d 100644
--- a/libmimedir/libmimedir_0.0-20040307.oe
+++ b/libmimedir/libmimedir_0.0-20040307.oe
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libc intltool-native"
 SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libmimedir-snapshot-20040307.tar.gz"
 S = "${WORKDIR}/libmimedir"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 headers = "mimedir-attachment.h mimedir-attendee.h mimedir-attribute.h mimedir-datetime.h mimedir-init.h mimedir-period.h mimedir-profile.h mimedir-recurrence-rule.h mimedir-recurrence.h mimedir-valarm.h mimedir-vcal.h mimedir-vcard-address.h mimedir-vcard-email.h mimedir-vcard-phone.h mimedir-vcard.h mimedir-vcomponent.h mimedir-vevent.h mimedir-vfreebusy.h mimedir-vjournal.h mimedir-vtimezone.h mimedir-vtodo.h mimedir.h"
 
diff --git a/libmodplug/libmodplug_0.7.oe b/libmodplug/libmodplug_0.7.oe
index a393e079b4..1488c5eb69 100644
--- a/libmodplug/libmodplug_0.7.oe
+++ b/libmodplug/libmodplug_0.7.oe
@@ -3,7 +3,7 @@ DESCRIPTION = "Library for reading mod-like audio files."
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_stage() {
 	install -m 0644 ${S}/src/modplug.h ${STAGING_INCDIR}
diff --git a/libogg/libogg_1.0.oe b/libogg/libogg_1.0.oe
index 7e5097b23e..f3a91bdc52 100644
--- a/libogg/libogg_1.0.oe
+++ b/libogg/libogg_1.0.oe
@@ -6,7 +6,7 @@ necessary to codec libraries like libvorbis."
 
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libogg-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage () {
 	oe_libinstall -a -so -C src libogg ${STAGING_LIBDIR}
diff --git a/libogg/libogg_1.1.oe b/libogg/libogg_1.1.oe
index be8a3c300a..8144baa2ae 100644
--- a/libogg/libogg_1.1.oe
+++ b/libogg/libogg_1.1.oe
@@ -6,7 +6,7 @@ necessary to codec libraries like libvorbis."
 
 SRC_URI = "http://www.vorbis.com/files/1.0.1/unix/libogg-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage () {
 	oe_libinstall -a -so -C src libogg ${STAGING_LIBDIR}
diff --git a/liboop/liboop_1.0.oe b/liboop/liboop_1.0.oe
index ec598ed4c2..8980b5a632 100644
--- a/liboop/liboop_1.0.oe
+++ b/liboop/liboop_1.0.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "http://download.ofb.net/liboop/liboop-${PV}.tar.bz2"
 S = "${WORKDIR}/liboop-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 headers = "oop.h oop-adns.h oop-glib.h \
 	  oop-tcl.h oop-www.h oop-rl.h \
diff --git a/libpixman/libpixman-cvs.oe b/libpixman/libpixman-cvs.oe
index d8a76c59ab..ffc93ed945 100644
--- a/libpixman/libpixman-cvs.oe
+++ b/libpixman/libpixman-cvs.oe
@@ -9,7 +9,7 @@ PROVIDES = "libpixman"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libpixman"
 S = "${WORKDIR}/libpixman"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
diff --git a/libsidplay/libsidplay_1.36.57.oe b/libsidplay/libsidplay_1.36.57.oe
index 23eb9da0be..9627884c75 100644
--- a/libsidplay/libsidplay_1.36.57.oe
+++ b/libsidplay/libsidplay_1.36.57.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "${DEBIAN_MIRROR}/main/libs/libsidplay/libsidplay_${PV}.orig.tar.gz \
            ${DEBIAN_MIRROR}/main/libs/libsidplay/libsidplay_${PV}-3.diff.gz;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage() {
 	oe_libinstall -so -C src libsidplay ${STAGING_LIBDIR}
diff --git a/libsigc++/libsigc++_1.2.5.oe b/libsigc++/libsigc++_1.2.5.oe
index ce7826d985..030ddb66f9 100644
--- a/libsigc++/libsigc++_1.2.5.oe
+++ b/libsigc++/libsigc++_1.2.5.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libsigc/libsigc++-${PV}.tar.gz"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 acpaths = "-I ${S}/scripts"
 
diff --git a/libtomcrypt/libtomcrypt_0.93.oe b/libtomcrypt/libtomcrypt_0.93.oe
index a531220f8f..abc9b17f03 100644
--- a/libtomcrypt/libtomcrypt_0.93.oe
+++ b/libtomcrypt/libtomcrypt_0.93.oe
@@ -13,7 +13,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "http://libtomcrypt.org/files/crypt-${PV}.tar.bz2 \
            file://${FILESDIR}/install.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 #FIXME add patch to make it shared
 
diff --git a/libtool/libtool-1.5/libtoolize-staging.patch b/libtool/libtool-1.5/libtoolize-staging.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/libtool/libtool-1.5/libtoolize-staging.patch
+++ /dev/null
diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe
index 4aed5a34d4..9d52fe00c3 100644
--- a/libtool/libtool-cross_1.5.oe
+++ b/libtool/libtool-cross_1.5.oe
@@ -5,21 +5,17 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
                    file://${FILESDIR}/sedvar.patch;patch=1 \
                    file://${FILESDIR}/tag.patch;patch=1 \
-                   file://${FILESDIR}/libtoolize-staging.patch;patch=1 \
                    file://${FILESDIR}/prefix.patch;patch=1 \
                    file://${FILESDIR}/ld.patch;patch=1 \
                    file://${FILESDIR}/chmod.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-# This should match what native.oeclass does
 prefix = "${STAGING_DIR}"
-exec_prefix = "${prefix}/${BUILD_SYS}"
 
 do_compile () {
 }
 
 do_stage () {
-        install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
         install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
 }
 
diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe
index a34b8d43ad..252167622a 100644
--- a/libtool/libtool-native_1.5.oe
+++ b/libtool/libtool-native_1.5.oe
@@ -6,7 +6,6 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
                    file://${FILESDIR}/sedvar.patch;patch=1 \
                    file://${FILESDIR}/tag.patch;patch=1 \
-                   file://${FILESDIR}/libtoolize-staging.patch;patch=1 \
                    file://${FILESDIR}/prefix.patch;patch=1 \
                    file://${FILESDIR}/ld.patch;patch=1 \
                    file://${FILESDIR}/chmod.patch;patch=1 \
diff --git a/libtool/libtool_1.5.oe b/libtool/libtool_1.5.oe
index f01d973180..112d984b96 100644
--- a/libtool/libtool_1.5.oe
+++ b/libtool/libtool_1.5.oe
@@ -6,7 +6,8 @@ libraries) behind a consistent interface."
 SRC_URI = "http://ftp.club.cc.cmu.edu/pub/gnu/libtool/libtool-${PV}.tar.gz \
            file://${FILESDIR}/m4.patch;patch=1 \
            file://${FILESDIR}/autotools.patch;patch=1 \
-	   file://${FILESDIR}/libtool15-update-configscripts.patch;patch=1;pnum=1"
+           file://${FILESDIR}/prefix.patch;patch=1 \
+           file://${FILESDIR}/libtool15-update-configscripts.patch;patch=1;pnum=1"
 S = "${WORKDIR}/libtool-${PV}"
 
 inherit autotools
diff --git a/libusb/libusb_0.1.7.oe b/libusb/libusb_0.1.7.oe
index af9d574df7..12af4720e6 100644
--- a/libusb/libusb_0.1.7.oe
+++ b/libusb/libusb_0.1.7.oe
@@ -5,7 +5,7 @@ access to USB devices."
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage() {
 	oe_libinstall -a -so libusb ${STAGING_LIBDIR}
diff --git a/libvorbis/libvorbis_1.0.1.oe b/libvorbis/libvorbis_1.0.1.oe
index 1a7d3e04fc..0d66a11c4f 100644
--- a/libvorbis/libvorbis_1.0.1.oe
+++ b/libvorbis/libvorbis_1.0.1.oe
@@ -6,7 +6,7 @@ is the main vorbis codec library."
 
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
 	        --with-ogg-includes=${STAGING_INCDIR}"
diff --git a/libxml/libxml2_2.6.7.oe b/libxml/libxml2_2.6.7.oe
index 015fd1e31f..0dbb6b240f 100644
--- a/libxml/libxml2_2.6.7.oe
+++ b/libxml/libxml2_2.6.7.oe
@@ -6,7 +6,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-${PV}.tar.bz2"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 EXTRA_OECONF = "--without-python"
 
diff --git a/libxrandr/libxrandr-cvs.oe b/libxrandr/libxrandr-cvs.oe
index e69de29bb2..cfc0a94e39 100644
--- a/libxrandr/libxrandr-cvs.oe
+++ b/libxrandr/libxrandr-cvs.oe
@@ -0,0 +1,18 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+DEPENDS = "virtual/libc randr x11 render xrender xext"
+PROVIDES = "libxrandr"
+DESCRIPTION = "X Resize and Rotate extension library."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrandr"
+S = "${WORKDIR}/Xrandr"
+
+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/lisa/lisa_0.2.2.oe b/lisa/lisa_0.2.2.oe
index 581e05c712..d2288d3c57 100644
--- a/lisa/lisa_0.2.2.oe
+++ b/lisa/lisa_0.2.2.oe
@@ -6,7 +6,7 @@ only relying on the TCP/IP protocol stack."
 SRC_URI = "http://lisa-home.sourceforge.net/src/lisa-${PV}.tar.bz2 \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 do_configure_prepend () {
 	set -e
diff --git a/lzo/lzo_1.08.oe b/lzo/lzo_1.08.oe
index ab1cc2da83..abbe4512d4 100644
--- a/lzo/lzo_1.08.oe
+++ b/lzo/lzo_1.08.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_configure () {
 	# override this function to avoid the autoconf/automake/aclocal/autoheader
diff --git a/mailutils/mailutils_0.3.1.oe b/mailutils/mailutils_0.3.1.oe
index 00b47ad6bc..79fe71a2b0 100644
--- a/mailutils/mailutils_0.3.1.oe
+++ b/mailutils/mailutils_0.3.1.oe
@@ -5,6 +5,6 @@ useful mail clients, servers, and libraries."
 SRC_URI = "${GNU_MIRROR}/mailutils/mailutils-${PV}.tar.bz2 \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--disable-pam --without-guile"
diff --git a/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.oe b/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.oe
index e69de29bb2..78100bda1c 100644
--- a/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.oe
+++ b/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.oe
@@ -0,0 +1,11 @@
+DESCRIPTION = "Matchbox input manager"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc matchbox-wm libmatchbox"
+
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.bz2"
+S = "${WORKDIR}/mb-applet-input-manager-${PV}"
+
+inherit autotools  pkgconfig
+
+FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
+ 
diff --git a/matchbox-common/matchbox-common_0.8.oe b/matchbox-common/matchbox-common_0.8.oe
index cbb2398033..ec7fc97623 100644
--- a/matchbox-common/matchbox-common_0.8.oe
+++ b/matchbox-common/matchbox-common_0.8.oe
@@ -5,7 +5,7 @@ DEPENDS = "libmatchbox"
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-common/${PV}/matchbox-common-${PV}.tar.bz2"
 S = "${WORKDIR}/matchbox-common-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--enable-pda-folders"
 
diff --git a/matchbox-desktop/matchbox-desktop_0.8.oe b/matchbox-desktop/matchbox-desktop_0.8.oe
index 241c9dc611..0ae08280c5 100644
--- a/matchbox-desktop/matchbox-desktop_0.8.oe
+++ b/matchbox-desktop/matchbox-desktop_0.8.oe
@@ -3,7 +3,7 @@ DEPENDS = "virtual/libc libmatchbox"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-desktop/${PV}/matchbox-desktop-${PV}.tar.bz2"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 FILES_${PN} = "${bindir} \
 	       ${datadir}/applications \
diff --git a/matchbox-panel-manager/matchbox-panel-manager_0.1.oe b/matchbox-panel-manager/matchbox-panel-manager_0.1.oe
index e69de29bb2..f779ae3edc 100644
--- a/matchbox-panel-manager/matchbox-panel-manager_0.1.oe
+++ b/matchbox-panel-manager/matchbox-panel-manager_0.1.oe
@@ -0,0 +1,11 @@
+DESCRIPTION = "Matchbox panel manager"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc gtk+"
+
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.bz2"
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools  pkgconfig
+
+FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
+
diff --git a/matchbox-panel/matchbox-panel_0.8.1.oe b/matchbox-panel/matchbox-panel_0.8.1.oe
index a9d4c0d6f0..d083d09309 100644
--- a/matchbox-panel/matchbox-panel_0.8.1.oe
+++ b/matchbox-panel/matchbox-panel_0.8.1.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc libmatchbox x11 xext xpm"
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2"
 S = "${WORKDIR}/matchbox-panel-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 FILES_${PN} = "${bindir} \
 	       ${datadir}/applications \
diff --git a/matchbox-panel/matchbox-panel_0.8.oe b/matchbox-panel/matchbox-panel_0.8.oe
index 64dd76264f..7103141fdf 100644
--- a/matchbox-panel/matchbox-panel_0.8.oe
+++ b/matchbox-panel/matchbox-panel_0.8.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libmatchbox matchbox-common"
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/${PV}/matchbox-panel-${PV}.tar.bz2"
 S = "${WORKDIR}/matchbox-panel-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--enable-small-icons"
 #		--enable-dnotify
diff --git a/matchbox-wm/matchbox-wm_0.8.1.oe b/matchbox-wm/matchbox-wm_0.8.1.oe
index 158a11b707..46c2ea42f9 100644
--- a/matchbox-wm/matchbox-wm_0.8.1.oe
+++ b/matchbox-wm/matchbox-wm_0.8.1.oe
@@ -6,7 +6,7 @@ SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/
 	   file://${FILESDIR}/m4.patch;patch=1"
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 FILES_${PN} = "${bindir} \
 	       ${datadir}/matchbox \
diff --git a/matchbox-wm/matchbox-wm_0.8.oe b/matchbox-wm/matchbox-wm_0.8.oe
index 8a63c0630e..fbcadfc580 100644
--- a/matchbox-wm/matchbox-wm_0.8.oe
+++ b/matchbox-wm/matchbox-wm_0.8.oe
@@ -7,7 +7,7 @@ SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/${PV
 	   file://${FILESDIR}/m4.patch;patch=1"
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--enable-composite"
 #		--enable-startup-notification
diff --git a/mikmod/mikmod_3.2.2-beta1.oe b/mikmod/mikmod_3.2.2-beta1.oe
index 6cdc7ea5b9..9798adad98 100644
--- a/mikmod/mikmod_3.2.2-beta1.oe
+++ b/mikmod/mikmod_3.2.2-beta1.oe
@@ -6,6 +6,6 @@ DEPENDS = "virtual/libc libmikmod"
 SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \
            file://${FILESDIR}/m4.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 LDFLAGS_append = " -lm"
diff --git a/ngrep/ngrep_1.41.oe b/ngrep/ngrep_1.41.oe
index 6bc36d2b8b..afaad88071 100644
--- a/ngrep/ngrep_1.41.oe
+++ b/ngrep/ngrep_1.41.oe
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ngrep/ngrep-${PV}.tar.bz2"
 EXTRA_OECONF = "--with-safe-user --with-restart"
 EXTRA_OEMAKE = "INCLUDES=${S}"
 
-inherit autotools libtool
+inherit autotools 
 
 do_install () {
 	oe_runmake BINDEST="${D}/${bindir}" MANDEST="${D}/${mandir}"
diff --git a/nmixer/nmixer_2.0.oe b/nmixer/nmixer_2.0.oe
index 0778213e7d..a201063197 100644
--- a/nmixer/nmixer_2.0.oe
+++ b/nmixer/nmixer_2.0.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc ncurses"
 
 SRC_URI = "http://www.stack.nl/~brama/projects/nmixer/src/nmixer-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_compile() {
 	oe_runmake nmixer INCLUDES=-I${STAGING_INCDIR}/
diff --git a/nsd/nsd_2.0.0.oe b/nsd/nsd_2.0.0.oe
index 57ddf04235..f2690f609f 100644
--- a/nsd/nsd_2.0.0.oe
+++ b/nsd/nsd_2.0.0.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "http://www.nlnetlabs.nl/downloads/nsd/nsd-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_install() {
 	oe_runconf 	configdir=${D}/etc/nsd              \
diff --git a/obexftp/obexftp_0.10.3.oe b/obexftp/obexftp_0.10.3.oe
index 2efb41c0e7..246661a621 100644
--- a/obexftp/obexftp_0.10.3.oe
+++ b/obexftp/obexftp_0.10.3.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc openobex"
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
 	   file://${FILESDIR}/m4.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 #EXTRA_OEMAKE = "'SUBDIRS=bfb cobexbfb cobexpe obexftp apps vmo doc'"
 EXTRA_OEMAKE = "'SUBDIRS=bfb cobexbfb cobexpe obexftp apps vmo'"
diff --git a/openjade/openjade_1.3.2.oe b/openjade/openjade_1.3.2.oe
index 0c6ff00c66..66d0f834e2 100644
--- a/openjade/openjade_1.3.2.oe
+++ b/openjade/openjade_1.3.2.oe
@@ -7,7 +7,7 @@ Specification Language) stylesheets to SGML and XML documents."
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
                 --enable-splibdir=${STAGING_LIBDIR}"
diff --git a/openobex-apps/openobex-apps_1.0.0.oe b/openobex-apps/openobex-apps_1.0.0.oe
index ef778c22da..a02118a948 100644
--- a/openobex-apps/openobex-apps_1.0.0.oe
+++ b/openobex-apps/openobex-apps_1.0.0.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc openobex"
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-apps-${PV}.tar.gz \
 	   file://${FILESDIR}/m4.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--disable-glibtest --with-glib-prefix=${STAGING_LIBDIR}/.."
 EXTRA_OEMAKE = "'INCLUDES='"
diff --git a/openobex/openobex_1.0.1.oe b/openobex/openobex_1.0.1.oe
index 8b98a0f96e..f3cb00364a 100644
--- a/openobex/openobex_1.0.1.oe
+++ b/openobex/openobex_1.0.1.oe
@@ -5,7 +5,7 @@ open source implementation of the Object Exchange \
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage () {
 	oe_libinstall -a -so -C src libopenobex-1.0 ${STAGING_LIBDIR}
diff --git a/opensp/opensp_1.5.oe b/opensp/opensp_1.5.oe
index 936c034b31..4feca60da9 100644
--- a/opensp/opensp_1.5.oe
+++ b/opensp/opensp_1.5.oe
@@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \
 	   file://${FILESDIR}/attributevalue.patch;patch=1"
 S = "${WORKDIR}/OpenSP-${PV}"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage () {
 	oe_libinstall -a -so -C lib libosp ${STAGING_LIBDIR}
diff --git a/pango/pango_1.2.5.oe b/pango/pango_1.2.5.oe
index 64255ac34d..ea5931f694 100644
--- a/pango/pango_1.2.5.oe
+++ b/pango/pango_1.2.5.oe
@@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/pango/1.2/pango-${PV}.tar.bz2
 	   file://${FILESDIR}/m4.patch;patch=1 \
 	   file://${FILESDIR}/no-tests.patch;patch=1"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no"
diff --git a/pango/pango_1.4.0.oe b/pango/pango_1.4.0.oe
index e69de29bb2..602ebfc7aa 100644
--- a/pango/pango_1.4.0.oe
+++ b/pango/pango_1.4.0.oe
@@ -0,0 +1,36 @@
+# Xt needed to keep autoconf's check for X11 happy
+DEPENDS = "virtual/libc glib-2.0 fontconfig freetype zlib x11 xft xt"
+DESCRIPTION = "The goal of the Pango project is to provide an \
+Open Source framework for the layout and rendering of \
+internationalized text."
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/pango-${PV}.tar.bz2 \
+	   file://${FILESDIR}/gtk-doc.patch;patch=1 \
+	   file://${FILESDIR}/no-tests.patch;patch=1"
+
+inherit autotools  pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest \
+		--enable-explicit-deps=no \
+	        --disable-debug"
+
+FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
+
+SOV = "0.399.1"
+LIBV = "1.4.0"
+
+do_stage () {
+	for lib in pango pangox pangoft2 pangoxft; do
+		oe_soinstall pango/.libs/lib$lib-1.0.so.${SOV} ${STAGING_LIBDIR}/
+		install -m 0644 pango/.libs/lib$lib-1.0.lai ${STAGING_LIBDIR}/lib$lib-1.0.la
+		install -m 0644 pango/.libs/lib$lib-1.0.a ${STAGING_LIBDIR}/
+	done
+	install -d ${STAGING_INCDIR}/pango
+	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
+}
+
+python populate_packages_prepend () {
+	modules_root = oe.data.expand('${libdir}/pango/${LIBV}/modules', d)
+
+	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', 'pango-querymodules > /etc/pango/pango.modules')
+}
diff --git a/panoramixext/panoramixext-cvs.oe b/panoramixext/panoramixext-cvs.oe
index e69de29bb2..1225490ba0 100644
--- a/panoramixext/panoramixext-cvs.oe
+++ b/panoramixext/panoramixext-cvs.oe
@@ -0,0 +1,21 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libc"
+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/pcre/pcre_4.4.oe b/pcre/pcre_4.4.oe
index 29067ab6bb..db717f7356 100644
--- a/pcre/pcre_4.4.oe
+++ b/pcre/pcre_4.4.oe
@@ -11,7 +11,7 @@ SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.
 	   file://${FILESDIR}/lai.patch;patch=1"
 S = "${WORKDIR}/pcre-${PV}"
 
-inherit autotools libtool
+inherit autotools 
 
 CFLAGS_append = " -D_REENTRANT"
 EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000"
diff --git a/pkgconfig/pkgconfig_0.15.0.oe b/pkgconfig/pkgconfig_0.15.0.oe
index ff070ea4f4..13b57a5955 100644
--- a/pkgconfig/pkgconfig_0.15.0.oe
+++ b/pkgconfig/pkgconfig_0.15.0.oe
@@ -7,7 +7,7 @@ seen with a single tool."
 SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV}.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 acpaths = "-I ."
 do_configure_prepend () {
diff --git a/pme/pme_1.0.3.oe b/pme/pme_1.0.3.oe
index 54014424ac..d9a36e1d4a 100644
--- a/pme/pme_1.0.3.oe
+++ b/pme/pme_1.0.3.oe
@@ -2,7 +2,7 @@ DEPENDS = "virtual/libc pcre"
 DESCRIPTION = "PME is a C++ wrapper around the PCRE library."
 SRC_URI = "http://xaxxon.slackworks.com/pme/pme-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage () {
 	oe_libinstall -a -so libpme ${STAGING_LIBDIR}
diff --git a/popt/popt_1.7.oe b/popt/popt_1.7.oe
index 3950184066..155f6815e8 100644
--- a/popt/popt_1.7.oe
+++ b/popt/popt_1.7.oe
@@ -5,7 +5,7 @@ for parsing command line options."
 SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
 	   file://${FILESDIR}/m4.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage () {
 	oe_libinstall -a -so libpopt ${STAGING_LIBDIR}
diff --git a/portaudio/portaudio_0.0.19.oe b/portaudio/portaudio_0.0.19.oe
index e25f34c79b..ac60dc4623 100644
--- a/portaudio/portaudio_0.0.19.oe
+++ b/portaudio/portaudio_0.0.19.oe
@@ -8,7 +8,7 @@ SRC_URI = "http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz \
 	   file://${FILESDIR}/flags.patch;patch=1"
 S = "${WORKDIR}/portaudio"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 EXTRA_OECONF = "--with-jack=no"
 
diff --git a/prboom/prboom_2.3.0.oe b/prboom/prboom_2.3.0.oe
index 24c2260119..c477a2a34c 100644
--- a/prboom/prboom_2.3.0.oe
+++ b/prboom/prboom_2.3.0.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc libsdl-qpe libsdl-mixer libsdl-net"
 SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
            file://${FILESDIR}/m4.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--without-x --disable-sdltest"
 
diff --git a/prelink/prelink_20031029.oe b/prelink/prelink_20031029.oe
index 99e5f81d67..439854acad 100644
--- a/prelink/prelink_20031029.oe
+++ b/prelink/prelink_20031029.oe
@@ -12,7 +12,7 @@ SRC_URI = "ftp://people.redhat.com/jakub/prelink/prelink-${PV}.tar.bz2 \
 	   file://${FILESDIR}/ts.Makefile.in.patch;patch=1"
 S = "${WORKDIR}/prelink"
 
-inherit autotools libtool
+inherit autotools 
 
 do_install_append () {
 	install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/default
diff --git a/prelink/prelink_20040304.oe b/prelink/prelink_20040304.oe
index a3a9ce4441..feafde5695 100644
--- a/prelink/prelink_20040304.oe
+++ b/prelink/prelink_20040304.oe
@@ -6,7 +6,7 @@ runtime and thus programs come up faster."
 SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz"
 S = "${WORKDIR}/prelink-0.0.${PV}"
 
-inherit autotools libtool
+inherit autotools 
 
 do_install_append () {
 	install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/default
diff --git a/pth/pth_2.0.0.oe b/pth/pth_2.0.0.oe
index de17a53a69..128ad44455 100644
--- a/pth/pth_2.0.0.oe
+++ b/pth/pth_2.0.0.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "ftp://ftp.ossp.org/pkg/lib/pth/pth-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_configure() {
 	oe_runconf
diff --git a/readline/readline_4.3.oe b/readline/readline_4.3.oe
index 45f503e366..eff10799b9 100644
--- a/readline/readline_4.3.oe
+++ b/readline/readline_4.3.oe
@@ -10,7 +10,7 @@ DEPENDS = "virtual/libc"
 SRC_URI = "ftp://ftp.cwru.edu/pub/bash/readline-${PV}.tar.gz \
 	   file://${FILESDIR}/signalnamespace.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 do_install_append () {
 	# Make install doesn't properly install these
diff --git a/rsync/rsync_2.6.1pre-1.oe b/rsync/rsync_2.6.1pre-1.oe
index e69de29bb2..806a446623 100644
--- a/rsync/rsync_2.6.1pre-1.oe
+++ b/rsync/rsync_2.6.1pre-1.oe
@@ -0,0 +1,16 @@
+DESCRIPTION = "A file-synchronization tool"
+SECTION = "net"
+PRIORITY = "optional"
+DEPENDS = "virtual/libc"
+
+SRC_URI = "http://rsync.samba.org/ftp/rsync/preview/rsync-${PV}.tar.gz \
+           file://${FILESDIR}/compile-fix.patch;patch=1"
+
+inherit autotools 
+
+EXTRA_OEMAKE='STRIP=""'
+
+do_compile_prepend() {
+	echo "#define HAVE_GETTIMEOFDAY_TZ 1" >>rsync.h
+	echo "#define uint64 int64" >>rsync.h
+}
diff --git a/rxvt-unicode/rxvt-unicode_1.9.oe b/rxvt-unicode/rxvt-unicode_1.9.oe
index 07ed9636c6..abc23ecbc1 100644
--- a/rxvt-unicode/rxvt-unicode_1.9.oe
+++ b/rxvt-unicode/rxvt-unicode_1.9.oe
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rxvt-unicode/rxvt-unicode-${PV}.tar.bz2 \
 	   file://${FILESDIR}/xim.patch;patch=1 \
 	   file://${FILESDIR}/include.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--disable-menubar \
 		--enable-ttygid \
diff --git a/rxvt-unicode/rxvt-unicode_2.2.oe b/rxvt-unicode/rxvt-unicode_2.2.oe
index f6e8491aa3..f150b9ab43 100644
--- a/rxvt-unicode/rxvt-unicode_2.2.oe
+++ b/rxvt-unicode/rxvt-unicode_2.2.oe
@@ -8,7 +8,7 @@ same time, including Xft fonts."
 SRC_URI = "${SOURCEFORGE_MIRROR}/rxvt-unicode/rxvt-unicode-${PV}.tar.bz2 \
 	   file://${FILESDIR}/include.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 #EXTRA_OECONF = "--enable-utmp --enable-wtmp --enable-lastlog \
 #		--disable-strings --with-term=rxvt --enable-keepscrolling \
diff --git a/rxvt/rxvt_2.7.9.oe b/rxvt/rxvt_2.7.9.oe
index e69de29bb2..6cf1af80e3 100644
--- a/rxvt/rxvt_2.7.9.oe
+++ b/rxvt/rxvt_2.7.9.oe
@@ -0,0 +1,33 @@
+DEPENDS = "virtual/libc x11 xft"
+DESCRIPTION = "Well known terminal emulator"
+
+SRC_URI = "pserver://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/rxvt \
+	   file://${FILESDIR}/include.patch;patch=1"
+
+inherit autotools 
+
+S = ${WORKDIR}/rxvt
+
+EXTRA_OECONF = "--disable-menubar --disable-xim \
+		--enable-utmp --enable-wtmp --enable-lastlog \
+		--disable-strings --with-term=rxvt --enable-keepscrolling \
+		--with-xft --with-name=rxvt --enable-frills \
+		--enable-swapscreen --enable-transparency \
+		--with-codesets=eu,jp \
+		--enable-cursor-blink --enable-pointer-blank \
+		--enable-text-blink --enable-plain-scroll \
+		--enable-combining --enable-shared \
+		--with-x=${STAGING_LIBDIR}/.."
+		
+EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
+		'XLIB=-L${STAGING_LIBDIR} -lX11 -lXft'"
+
+do_configure () {
+	autotools_do_configure
+	echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
+	echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
+	echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
+	echo '#define HAVE_XLOCALE 1' >> config.h
+	echo '#define HAVE_UTMP_H 1' >> config.h
+	echo '#define HAVE_TTYSLOT 1' >> config.h
+}
diff --git a/scummvm/scummvm_0.5.1.oe b/scummvm/scummvm_0.5.1.oe
index 37bccd4667..6a3a4eabab 100644
--- a/scummvm/scummvm_0.5.1.oe
+++ b/scummvm/scummvm_0.5.1.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc libsdl-qpe libmad libvorbis libogg"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--backend=sdl \
 		--with-sdl-prefix=${STAGING_BINDIR}/.. \
diff --git a/scummvm/scummvm_0.6.0.oe b/scummvm/scummvm_0.6.0.oe
index a78a2f28cd..bfa60de2d2 100644
--- a/scummvm/scummvm_0.6.0.oe
+++ b/scummvm/scummvm_0.6.0.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc libsdl-qpe libmad libvorbis libogg"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--backend=sdl \
 		--with-sdl-prefix=${STAGING_BINDIR}/.. \
diff --git a/sed/sed-native_4.0.9.oe b/sed/sed-native_4.0.9.oe
index a2d84c379f..96e63b8946 100644
--- a/sed/sed-native_4.0.9.oe
+++ b/sed/sed-native_4.0.9.oe
@@ -1,5 +1,2 @@
 include sed_${PV}.oe
-S = "${WORKDIR}/sed-${PV}"
-DEPENDS = ""
-
 inherit native
diff --git a/sed/sed_4.0.9.oe b/sed/sed_4.0.9.oe
index 62324d11e4..55ad2427dc 100644
--- a/sed/sed_4.0.9.oe
+++ b/sed/sed_4.0.9.oe
@@ -1,6 +1,6 @@
-DEPENDS = "virtual/libc"
 DESCRIPTION = "sed is a Stream EDitor."
 
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz"
+S = "${WORKDIR}/sed-${PV}"
 
 inherit autotools
diff --git a/slang/slang_1.4.9.oe b/slang/slang_1.4.9.oe
index 91a38ad2c7..ee26e839fe 100644
--- a/slang/slang_1.4.9.oe
+++ b/slang/slang_1.4.9.oe
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v1.4/slang-${PV}.tar.bz2"
 
-inherit autotools libtool
+inherit autotools 
 
 acpaths = "-I ${S}/autoconf"
 EXTRA_OECONF="--enable-warnings"
diff --git a/sm/sm-cvs.oe b/sm/sm-cvs.oe
index e69de29bb2..919e058389 100644
--- a/sm/sm-cvs.oe
+++ b/sm/sm-cvs.oe
@@ -0,0 +1,16 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libc 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/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe b/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe
index d16cd51f97..586da15429 100644
--- a/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe
+++ b/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe
@@ -12,7 +12,7 @@ SRC_URI = "cvs://anonymous:anonymous@cvs.icculus.org/cvs/cvsroot;module=smpeg;da
 	   file://${FILESDIR}/compile.patch;patch=1"
 S = "${WORKDIR}/smpeg"
 
-inherit autotools libtool
+inherit autotools 
 
 CFLAGS_append = " -I${STAGING_INCDIR}/SDL"
 EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \
diff --git a/sqlite/sqlite_2.8.9.oe b/sqlite/sqlite_2.8.9.oe
index 8fd623fbf7..f50fbe160f 100644
--- a/sqlite/sqlite_2.8.9.oe
+++ b/sqlite/sqlite_2.8.9.oe
@@ -8,7 +8,7 @@ SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
 
 S = "${WORKDIR}/sqlite"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--without-tcl --enable-static --enable-shared"
 export config_BUILD_CC = "${BUILD_CC}"
diff --git a/startup-notification/startup-notification_0.5.oe b/startup-notification/startup-notification_0.5.oe
index e691169f72..1a54a3507d 100644
--- a/startup-notification/startup-notification_0.5.oe
+++ b/startup-notification/startup-notification_0.5.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
 DEPENDS = "virtual/libc x11"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 SRC_URI = "http://freedesktop.org/Software/startup-notification/releases/startup-notification-${PV}.tar.gz"
 
diff --git a/stunnel/stunnel_4.05.oe b/stunnel/stunnel_4.05.oe
index 55a48661c8..0d538b0660 100644
--- a/stunnel/stunnel_4.05.oe
+++ b/stunnel/stunnel_4.05.oe
@@ -8,4 +8,4 @@ SRC_URI = "http://www.stunnel.org/download/stunnel/src/stunnel-${PV}.tar.gz \
 	   file://${FILESDIR}/automake.patch;patch=1"
 S = "${WORKDIR}/stunnel-${PV}"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/sword/sword_1.5.7.oe b/sword/sword_1.5.7.oe
index 873394771a..385117e578 100644
--- a/sword/sword_1.5.7.oe
+++ b/sword/sword_1.5.7.oe
@@ -9,7 +9,7 @@ PR = "2"
 SRC_URI = "${DEBIAN_MIRROR}/main/s/sword/sword_${PV}.orig.tar.gz \
            ${DEBIAN_MIRROR}/main/s/sword/sword_${PV}-${PR}.diff.gz;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 do_stage() {
 	oe_libinstall -so -C lib libsword ${STAGING_LIBDIR}
diff --git a/sylpheed/sylpheed_0.9.9-gtk2-20040229.oe b/sylpheed/sylpheed_0.9.9-gtk2-20040229.oe
index e69de29bb2..1982910384 100644
--- a/sylpheed/sylpheed_0.9.9-gtk2-20040229.oe
+++ b/sylpheed/sylpheed_0.9.9-gtk2-20040229.oe
@@ -0,0 +1,8 @@
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sylpheed-gtk2/sylpheed-0.9.9-gtk2-20040229.tar.gz"
+
+inherit autotools 
+
diff --git a/t1lib/t1lib_5.0.0.oe b/t1lib/t1lib_5.0.0.oe
index 2f3740ab7d..bf506434a5 100644
--- a/t1lib/t1lib_5.0.0.oe
+++ b/t1lib/t1lib_5.0.0.oe
@@ -8,7 +8,7 @@ SRC_URI = "http://www.netsw.org/graphic/font/t1lib-${PV}.tar.gz \
            file://${FILESDIR}/configure.patch;patch=1 \
            file://${FILESDIR}/install.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--without-x --without-athena"
 EXTRA_OEMAKE = "without_doc"
diff --git a/t1lib/t1lib_5.0.1.oe b/t1lib/t1lib_5.0.1.oe
index ec5518ed0f..56ddb34308 100644
--- a/t1lib/t1lib_5.0.1.oe
+++ b/t1lib/t1lib_5.0.1.oe
@@ -8,7 +8,7 @@ SRC_URI = "ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-${PV}.tar.gz \
            file://${FILESDIR}/configure.patch;patch=1 \
            file://${FILESDIR}/install.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--without-x --without-athena"
 EXTRA_OEMAKE = "without_doc"
diff --git a/tcpdump/tcpdump_3.8.1.oe b/tcpdump/tcpdump_3.8.1.oe
index 8a3a35a0ef..b22898e1d6 100644
--- a/tcpdump/tcpdump_3.8.1.oe
+++ b/tcpdump/tcpdump_3.8.1.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc base/libpcap-0.8.1"
 
 SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz"
 
-inherit autotools libtool
+inherit autotools 
 
 do_configure() {
 	oe_runconf
diff --git a/tin/tin_1.7.3.oe b/tin/tin_1.7.3.oe
index 6ddecfc232..ad6d73e9e4 100644
--- a/tin/tin_1.7.3.oe
+++ b/tin/tin_1.7.3.oe
@@ -6,7 +6,7 @@ SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \
 	   file://${FILESDIR}/m4.patch;patch=1 \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--with-screen=ncurses"
 
diff --git a/tn5250/tn5250_0.16.5.oe b/tn5250/tn5250_0.16.5.oe
index 67f2311dcd..826ccb310b 100644
--- a/tn5250/tn5250_0.16.5.oe
+++ b/tn5250/tn5250_0.16.5.oe
@@ -5,4 +5,4 @@ DEPENDS = "virtual/libc ncurses openssl"
 SRC_URI = "${SOURCEFORGE_MIRROR}/tn5250/tn5250-${PV}.tar.gz \
 	   file://${FILESDIR}/compile.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
diff --git a/tslib/tslib.oe b/tslib/tslib.oe
index 02a0cbc62d..dcf0ba433a 100644
--- a/tslib/tslib.oe
+++ b/tslib/tslib.oe
@@ -18,7 +18,7 @@ SRC_URI_append = " file://${FILESDIR}/raw-hwread.patch;patch=1"
 #SRC_URI_append = " file://${FILESDIR}/ts_calibrate.patch;patch=1"
 S = "${WORKDIR}/tslib"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--enable-shared"
 
diff --git a/uae/uae_0.8.23-20040129.oe b/uae/uae_0.8.23-20040129.oe
index 21e2152672..14a8e63d0f 100644
--- a/uae/uae_0.8.23-20040129.oe
+++ b/uae/uae_0.8.23-20040129.oe
@@ -7,7 +7,7 @@ SRC_URI = "http://rcdrummond.net/uae/uae-${PV}/uae-${PV}.tar.bz2 \
            file://${FILESDIR}/configure.patch;patch=1 \
            file://${FILESDIR}/m4.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--with-hostcc=gcc --disable-ui --without-x \
 		--without-gtk --enable-jit --disable-natmem \
diff --git a/usbutils/usbutils_0.11.oe b/usbutils/usbutils_0.11.oe
index c66962852b..f77908e8fd 100644
--- a/usbutils/usbutils_0.11.oe
+++ b/usbutils/usbutils_0.11.oe
@@ -5,7 +5,7 @@ SRC_URI = "http://wwwbode.cs.tum.edu/Par/arch/usb/download/usbutils/usbutils-${P
 	   file://${FILESDIR}/configure.patch;patch=1"
 S = "${WORKDIR}/usbutils-${PV}"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--program-prefix="
 sbindir = "/sbin"
diff --git a/vorbis-tools/vorbis-tools_1.0.1.oe b/vorbis-tools/vorbis-tools_1.0.1.oe
index 67208a3b6e..9a77f6ff19 100644
--- a/vorbis-tools/vorbis-tools_1.0.1.oe
+++ b/vorbis-tools/vorbis-tools_1.0.1.oe
@@ -6,7 +6,7 @@ vorbiscomment (ogg comment editor)."
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/vorbis-tools-${PV}.tar.gz \
 	   file://${FILESDIR}/m4.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools 
 
 EXTRA_OECONF = "--without-flac --without-speex \
 		--with-ogg-libraries=${STAGING_LIBDIR}/ \
diff --git a/x11/x11-cvs.oe b/x11/x11-cvs.oe
index 6516c1d1cb..d4d4429dc9 100644
--- a/x11/x11-cvs.oe
+++ b/x11/x11-cvs.oe
@@ -10,7 +10,7 @@ FILES_${PN}_append = " ${datadir}/X11"
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11"
 S = "${WORKDIR}/X11"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_compile() {
 	(
diff --git a/xau/xau-cvs.oe b/xau/xau-cvs.oe
index 4d86e1237c..41fd6d67e8 100644
--- a/xau/xau-cvs.oe
+++ b/xau/xau-cvs.oe
@@ -9,7 +9,7 @@ DESCRIPTION = "Authorization Protocol for X."
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xau"
 S = "${WORKDIR}/Xau"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xcompmgr/xcompmgr-cvs.oe b/xcompmgr/xcompmgr-cvs.oe
index e69de29bb2..3974d8fa72 100644
--- a/xcompmgr/xcompmgr-cvs.oe
+++ b/xcompmgr/xcompmgr-cvs.oe
@@ -0,0 +1,11 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "x11"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libc 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/xcomposite/xcomposite-cvs.oe b/xcomposite/xcomposite-cvs.oe
index f533dccd19..8e76dc5ffc 100644
--- a/xcomposite/xcomposite-cvs.oe
+++ b/xcomposite/xcomposite-cvs.oe
@@ -7,7 +7,7 @@ DESCRIPTION = "X Composite extension library."
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcomposite"
 S = "${WORKDIR}/Xcomposite"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xcursor/xcursor-cvs.oe b/xcursor/xcursor-cvs.oe
index e69de29bb2..4e8ed6330c 100644
--- a/xcursor/xcursor-cvs.oe
+++ b/xcursor/xcursor-cvs.oe
@@ -0,0 +1,21 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libc"
+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/xdamage/xdamage-cvs.oe b/xdamage/xdamage-cvs.oe
index 6ecce41d41..69ff97192e 100644
--- a/xdamage/xdamage-cvs.oe
+++ b/xdamage/xdamage-cvs.oe
@@ -9,7 +9,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdamage \
 	   file://${FILESDIR}/m4.patch;patch=1"
 S = "${WORKDIR}/Xdamage"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xdmcp/libxdmcp_0.1.1.oe b/xdmcp/libxdmcp_0.1.1.oe
index e69de29bb2..b467fb241f 100644
--- a/xdmcp/libxdmcp_0.1.1.oe
+++ b/xdmcp/libxdmcp_0.1.1.oe
@@ -0,0 +1,19 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "virtual/libc xproto"
+PROVIDES = "xdmcp"
+DESCRIPTION = "X Display Manager Control Protocol library."
+S = "${WORKDIR}/libXdmcp-${PV}"
+
+SRC_URI = "http://freedesktop.org/~xlibs/release/libXdmcp-${PV}.tar.bz2"
+
+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/xdmcp/libxdmcp_cvs.oe b/xdmcp/libxdmcp_cvs.oe
index e69de29bb2..c303571f26 100644
--- a/xdmcp/libxdmcp_cvs.oe
+++ b/xdmcp/libxdmcp_cvs.oe
@@ -0,0 +1,20 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "virtual/libc xproto"
+PROVIDES = "xdmcp"
+DESCRIPTION = "X Display Manager Control Protocol library."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdmcp"
+S = "${WORKDIR}/Xdmcp"
+
+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
index 2033236078..5318cae009 100644
--- a/xext/xext-cvs.oe
+++ b/xext/xext-cvs.oe
@@ -8,7 +8,7 @@ PROVIDES = "xext"
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xext"
 S = "${WORKDIR}/Xext"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xfixes/xfixes-cvs.oe b/xfixes/xfixes-cvs.oe
index d4e32d9b54..8020c46e66 100644
--- a/xfixes/xfixes-cvs.oe
+++ b/xfixes/xfixes-cvs.oe
@@ -7,7 +7,7 @@ DESCRIPTION = "X Fixes extension library."
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfixes"
 S = "${WORKDIR}/Xfixes"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xfont/xfont-cvs.oe b/xfont/xfont-cvs.oe
index 151dfe14b4..1c19b6cd52 100644
--- a/xfont/xfont-cvs.oe
+++ b/xfont/xfont-cvs.oe
@@ -9,7 +9,7 @@ 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 libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xft/xft-cvs.oe b/xft/xft-cvs.oe
index 2c7e45042f..daf8888701 100644
--- a/xft/xft-cvs.oe
+++ b/xft/xft-cvs.oe
@@ -12,7 +12,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig \
 		${datadir}/aclocal ${bindir} ${sbindir}
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xi/xi-cvs.oe b/xi/xi-cvs.oe
index e9da6fccfa..42b357190e 100644
--- a/xi/xi-cvs.oe
+++ b/xi/xi-cvs.oe
@@ -7,7 +7,7 @@ DESCRIPTION = "X Input extension library."
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xi"
 S = "${WORKDIR}/Xi"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xinerama/xinerama-cvs.oe b/xinerama/xinerama-cvs.oe
index e69de29bb2..3c8a19ff2e 100644
--- a/xinerama/xinerama-cvs.oe
+++ b/xinerama/xinerama-cvs.oe
@@ -0,0 +1,21 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libc 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/xpm/xpm-cvs.oe b/xpm/xpm-cvs.oe
index 4773422918..c74350783a 100644
--- a/xpm/xpm-cvs.oe
+++ b/xpm/xpm-cvs.oe
@@ -9,7 +9,7 @@ DESCRIPTION = "X Pixmap library."
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xpm"
 S = "${WORKDIR}/Xpm"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage () {
 	install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
diff --git a/xrandr/xrandr-cvs.oe b/xrandr/xrandr-cvs.oe
index 026b5c9a0e..4ae5f76880 100644
--- a/xrandr/xrandr-cvs.oe
+++ b/xrandr/xrandr-cvs.oe
@@ -5,7 +5,7 @@ DESCRIPTION = "X Resize and Rotate extension command."
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xrandr"
 S = "${WORKDIR}/xrandr"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_configure_prepend() {
 	./autogen.sh
diff --git a/xrender/xrender-cvs.oe b/xrender/xrender-cvs.oe
index fa37019f1c..e8ec1fd004 100644
--- a/xrender/xrender-cvs.oe
+++ b/xrender/xrender-cvs.oe
@@ -7,7 +7,7 @@ DESCRIPTION = "X Render extension library."
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrender"
 S = "${WORKDIR}/Xrender"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xres/xres-cvs.oe b/xres/xres-cvs.oe
index dbab097d5a..3440ef0cf7 100644
--- a/xres/xres-cvs.oe
+++ b/xres/xres-cvs.oe
@@ -8,7 +8,7 @@ DESCRIPTION = "X Resource usage library."
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XRes"
 S = "${WORKDIR}/XRes"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xserver/xserver-cvs.oe b/xserver/xserver-cvs.oe
index 4966f6ca7e..a15b7f6958 100644
--- a/xserver/xserver-cvs.oe
+++ b/xserver/xserver-cvs.oe
@@ -13,6 +13,6 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver
 	file://${FILESDIR}/shrotate.patch;patch=1;pnum=0"
 S = "${WORKDIR}/xserver"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 EXTRA_OECONF = "--enable-composite --disable-xinerama"
diff --git a/xstroke/xstroke-cvs.oe b/xstroke/xstroke-cvs.oe
index e69de29bb2..59c85de31a 100644
--- a/xstroke/xstroke-cvs.oe
+++ b/xstroke/xstroke-cvs.oe
@@ -0,0 +1,11 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "x11"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libc x11"
+DESCRIPTION = "Gesture recognition input method for X11"
+
+SRC_URI = "cvs://anoncvs:anoncvs@xstroke.org/cvs/xstroke;module=xstroke"
+S = "${WORKDIR}/xstroke"
+
+inherit autotools pkgconfig 
diff --git a/xstroke/xstroke_0.6.oe b/xstroke/xstroke_0.6.oe
index e69de29bb2..4db2c6a373 100644
--- a/xstroke/xstroke_0.6.oe
+++ b/xstroke/xstroke_0.6.oe
@@ -0,0 +1,9 @@
+SECTION = "x11"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libc x11"
+DESCRIPTION = "Gesture recognition input method for X11"
+
+SRC_URI = "http://xstroke.org/releases/xstroke-0.6.tar.gz"
+
+inherit autotools pkgconfig 
diff --git a/xt/xt-cvs.oe b/xt/xt-cvs.oe
index e69de29bb2..24979451c9 100644
--- a/xt/xt-cvs.oe
+++ b/xt/xt-cvs.oe
@@ -0,0 +1,16 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "virtual/libc 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/xtrans/xtrans-cvs.oe b/xtrans/xtrans-cvs.oe
index c7de342e72..ca3c9edce0 100644
--- a/xtrans/xtrans-cvs.oe
+++ b/xtrans/xtrans-cvs.oe
@@ -9,7 +9,7 @@ network vageries."
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=xtrans"
 S = "${WORKDIR}/xtrans"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xtrans/xtrans_0.1.oe b/xtrans/xtrans_0.1.oe
index 2aefe69bcd..2e6793d0d0 100644
--- a/xtrans/xtrans_0.1.oe
+++ b/xtrans/xtrans_0.1.oe
@@ -7,7 +7,7 @@ network vageries."
 SRC_URI = "http://freedesktop.org/~xlibs/release/libXtrans-0.1.tar.bz2"
 S = "${WORKDIR}/libXtrans-${PV}"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/xtst/xtst-cvs.oe b/xtst/xtst-cvs.oe
index efb43dcbd4..cc18c570b4 100644
--- a/xtst/xtst-cvs.oe
+++ b/xtst/xtst-cvs.oe
@@ -10,7 +10,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xtst \
            file://${FILESDIR}/no-xrecord.patch;patch=1;pnum=0"
 S = "${WORKDIR}/Xtst"
 
-inherit autotools pkgconfig libtool
+inherit autotools pkgconfig 
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/zziplib/zziplib_0.10.82.oe b/zziplib/zziplib_0.10.82.oe
index 27f93a97e1..258ef6e11e 100644
--- a/zziplib/zziplib_0.10.82.oe
+++ b/zziplib/zziplib_0.10.82.oe
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libc"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zziplib/zziplib-${PV}.tar.bz2"
 
-inherit autotools libtool pkgconfig
+inherit autotools  pkgconfig
 
 do_stage() {
 	oe_libinstall -a -so libzzip-0 ${STAGING_LIBDIR}
author	Chris Larson <clarson@kergoth.com>	2004-05-10 00:52:47 +0000
committer	Chris Larson <clarson@kergoth.com>	2004-05-10 00:52:47 +0000
commit	cb2f160c0ebcbf8421988e7ee9818e007e085305 (patch)
tree	7b25aca42bcde8335efe58709261da5ca5504f70
parent	e18dbb2be3143c54092ca6025161cbc750990b0a (diff)