merge of 63ed41d76f8dfaf354b6d3cb63030e21615724aa

     and fdfebdd28e61ad95af198e9e89ea98fa9b5279c1

12 files changed, 105 insertions, 45 deletions

diff --git a/packages/efl/etk_20060418.bb b/packages/efl/etk_20060418.bb
index 1d53d683b3..bf1f98d497 100644
--- a/packages/efl/etk_20060418.bb
+++ b/packages/efl/etk_20060418.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries"
+DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
 DEPENDS = "evas-x11 ecore-x11 edje"
 LICENSE = "MIT"
 PR = "r1"
diff --git a/packages/efl/etox_0.9.0.004.bb b/packages/efl/etox_0.9.0.004.bb
deleted file mode 100644
index e61759a22e..0000000000
--- a/packages/efl/etox_0.9.0.004.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \
-Etox helps you when it comes to displaying, moving, resizing, layering, \
-clipping, aligning and coloring fonts in different styles, and more."
-DEPENDS = "edb virtual/evas virtual/ecore"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit efl
-
-libdirectory = "src"
diff --git a/packages/efl/ewl_0.0.4.007.bb b/packages/efl/ewl_0.0.4.007.bb
index e89b668b93..3a9313cb59 100644
--- a/packages/efl/ewl_0.0.4.007.bb
+++ b/packages/efl/ewl_0.0.4.007.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "The Enlightened Widget Library, \
 a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
-# as of recent CVS HEAD, ewl no longer needs etox and no longer needs edb
 DEPENDS = "edb virtual/evas virtual/ecore edje"
 # emotion
 RDEPENDS += "ewl-themes"
diff --git a/packages/ethereal/ethereal-native_0.99.0.bb b/packages/ethereal/ethereal-native_0.99.0.bb
deleted file mode 100644
index b5e0c589ed..0000000000
--- a/packages/ethereal/ethereal-native_0.99.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require ethereal_${PV}.bb
-DEPENDS = "perl-native libpcap-native"
-inherit native
-
-EXTRA_OECONF = "\
-		--enable-ethereal=no \
-		--enable-tethereal=yes \
-		--enable-editcap=no \
-		--enable-dumpcap=no \
-		--enable-capinfos=no \
-		--enable-mergecap=no \
-		--enable-text2pcap=no \
-		--enable-idl2eth=no"
-
-do_stage() {
-	install -m 0755 rdps ${STAGING_BINDIR}/ethereal-rdps
-	install -m 0755 tools/lemon/lemon ${STAGING_BINDIR}/ethereal-lemon
-}
-
-do_install() {
-	:
-}
-
diff --git a/packages/ethereal/ethereal_0.99.0.bb b/packages/ethereal/ethereal_0.99.0.bb
index 96e121a3a7..1c46e432d5 100644
--- a/packages/ethereal/ethereal_0.99.0.bb
+++ b/packages/ethereal/ethereal_0.99.0.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Ethereal is the world's most popular network protocol analyzer"
 HOMEPAGE = "http://www.ethereal.com"
 SECTION = "x11/network"
 LICENSE = "GPL"
+DEPENDS = "perl-native gtk+ gnutls libpcap"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-
-DEPENDS = "perl-native ethereal-native gtk+ libpcap"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ethereal/ethereal-${PV}.tar.bz2 \
            file://use-our-lemon.patch;patch=1"
@@ -13,6 +13,7 @@ S = "${WORKDIR}/ethereal-${PV}"
 inherit autotools
 
 do_compile_prepend() {
-	ln -sf ${STAGING_BINDIR}/ethereal-rdps rdps
-	ln -sf ${STAGING_BINDIR}/ethereal-lemon tools/lemon/lemon
+	${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
+	oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}"
 }
+
diff --git a/packages/gpe-calendar/gpe-calendar_cvs.bb b/packages/gpe-calendar/gpe-calendar_cvs.bb
index f75987c762..228d701fec 100644
--- a/packages/gpe-calendar/gpe-calendar_cvs.bb
+++ b/packages/gpe-calendar/gpe-calendar_cvs.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/${PN}"
-PV = "0.73+cvs${SRCDATE}"
+PV = "0.72+cvs${SRCDATE}"
 PR = "r1"
 
 PARALLEL_MAKE = ""
diff --git a/packages/mtd/mtd-utils_1.0.0.bb b/packages/mtd/mtd-utils_1.0.0.bb
new file mode 100644
index 0000000000..06347339a1
--- /dev/null
+++ b/packages/mtd/mtd-utils_1.0.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Tools for managing memory technology devices."
+SECTION = "base"
+DEPENDS = "zlib"
+HOMEPAGE = "http://www.linux-mtd.infradead.org/"
+LICENSE = "GPLv2"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.0.0.tar.gz"
+
+CFLAGS_prepend = "-I${WORKDIR}/mtd-utils-${PV}/include "
+
+do_install() {
+	oe_runmake install DESTDIR=${D}
+}
diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb
index fe8c42dd88..d35442b50a 100644
--- a/packages/mysql/mysql_4.1.18.bb
+++ b/packages/mysql/mysql_4.1.18.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "The MySQL Open Source Database System"
 SECTION = "libs"
+HOMEPAGE = "http://www.mysql.com/"
 DEPENDS += "ncurses mysql-native"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
@@ -38,9 +40,76 @@ pkg_postrm () {
 	grep mysql /etc/passwd && deluser mysql
 }
 
-PACKAGES =+ "libmysqlclient libmysqlclient-dev"
+PACKAGES = "${PN} libmysqlclient libmysqlclient-dev mysql-client mysql-server"
+
+FILES_${PN} = " "
+RDEPENDS_${PN} = "mysql-client mysql-server"
+ALLOW_EMPTY_${PN} = "1"
 
 FILES_libmysqlclient = "${libdir}/libmysqlclient*.so.*"
-FILES_libmysqlclient-dev = "${incdir}/mysql ${libdir}/lib* \
-                ${bindir}/mysql_config"
+FILES_libmysqlclient-dev = "${includedir}/mysql/ ${libdir}/lib* ${bindir}/mysql_config"
+
+FILES_mysql-client = "\
+${bindir}/myisam_ftdump \
+${bindir}/mysql \
+${bindir}/mysql_explain_log \
+${bindir}/mysql_find_rows \
+${bindir}/mysql_fix_extensions \
+${bindir}/mysql_tableinfo \
+${bindir}/mysql_waitpid \
+${bindir}/mysqlaccess \
+${bindir}/mysqladmin \
+${bindir}/mysqlbug \
+${bindir}/mysqlcheck \
+${bindir}/mysqldump \
+${bindir}/mysqldumpslow \
+${bindir}/mysqlimport \
+${bindir}/mysqlmanager \
+${bindir}/mysqlmanager-pwgen \
+${bindir}/mysqlmanagerc \
+${bindir}/mysqlshow"
 
+FILES_mysql-server = "\
+${bindir}/comp_err \
+${bindir}/isamchk \
+${bindir}/isamlog \
+${bindir}/msql2mysql \
+${bindir}/myisamchk \
+${bindir}/myisamlog \
+${bindir}/myisampack \
+${bindir}/my_print_defaults \
+${bindir}/mysqlbinlog \
+${bindir}/mysql_convert_table_format \
+${bindir}/mysql_create_system_tables \
+${bindir}/mysqld_multi \
+${bindir}/mysqld_safe \
+${bindir}/mysql_fix_privilege_tables \
+${bindir}/mysqlhotcopy \
+${bindir}/mysql_install_db \
+${bindir}/mysql_secure_installation \
+${bindir}/mysql_setpermission \
+${bindir}/mysqltest \
+${bindir}/mysql_tzinfo_to_sql \
+${bindir}/mysql_zap \
+${bindir}/pack_isam \
+${bindir}/perror \
+${bindir}/replace \
+${bindir}/resolveip \
+${bindir}/resolve_stack_dump \
+${bindir}/ndb_delete_all \
+${bindir}/ndb_mgm \
+${bindir}/ndb_show_tables \
+${bindir}/ndb_desc \
+${bindir}/ndb_restore \
+${bindir}/ndb_waiter \
+${bindir}/ndb_drop_index \
+${bindir}/ndb_select_all \
+${bindir}/ndb_drop_table \
+${bindir}/ndb_select_count \
+${libexecdir}/mysqld \
+${sbindir}/mysqld \
+${sbindir}/ndb_cpcd \
+${sbindir}/ndbd \
+${sbindir}/ndb_mgmd \
+${datadir}/mysql/ \
+${localstatedir}/mysql/"
diff --git a/packages/pwlib/pwlib_1.6.6.4.bb b/packages/pwlib/pwlib_1.6.6.4.bb
index 36dd9e031a..2db6a53f15 100644
--- a/packages/pwlib/pwlib_1.6.6.4.bb
+++ b/packages/pwlib/pwlib_1.6.6.4.bb
@@ -2,12 +2,15 @@
 # Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see /COPYING)
 
+
+DEFAULT_PREFERENCE = "-1"
+
 HOMEPAGE="http://www.openh323.org/docs/PWLib/"
 DESCRIPTION="Portable Text and GUI C/C++ Class Libarary."
 MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
 
-SRC_URI="http://http.us.debian.org/debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.gz"
+SRC_URI="${DEBIAN_MIRROR}/main/p/${PN}/${PN}_${PV}.orig.tar.gz"
 DEPENDS="openssl openldap"
 
 inherit autotools
diff --git a/packages/python/python-spydi_0.9.3.bb b/packages/python/python-spydi_0.9.3.bb
index ebf7d166c2..e20bf754de 100644
--- a/packages/python/python-spydi_0.9.3.bb
+++ b/packages/python/python-spydi_0.9.3.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 PR = "ml0"
 
-SRC_URI = "http://lsc.fie.umich.mx/%7esadit/spyro/spydi-${PV}.tgz"
+SRC_URI = "http://lsc.fie.umich.mx/%7esadit/spyro/SPyDI-${PV}.tar.gz"
 S = "${WORKDIR}/SPyDI-${PV}"
 
 inherit distutils
diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb
index f92414ac73..65b8723c2f 100644
--- a/packages/qt/qt-x11-free_3.3.6.bb
+++ b/packages/qt/qt-x11-free_3.3.6.bb
@@ -53,6 +53,10 @@ do_compile() {
 }
 
 do_stage() {
+	install -d ${STAGING_QT_DIR}/bin
+	ln -sf ${STAGING_BINDIR}/moc3 ${STAGING_QT_DIR}/bin/moc
+	ln -sf ${STAGING_BINDIR}/uic3 ${STAGING_QT_DIR}/bin/uic
+	ln -sf ${STAGING_BINDIR}/qmake ${STAGING_QT_DIR}/bin/qmake
 	install -d ${STAGING_QT_DIR}/lib
 	oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
 	install -d ${STAGING_QT_DIR}/include/private
diff --git a/packages/sip/sip4-native_4.4.3.bb b/packages/sip/sip4-native_4.4.3.bb
index 395fa15ac7..f7858a3b79 100644
--- a/packages/sip/sip4-native_4.4.3.bb
+++ b/packages/sip/sip4-native_4.4.3.bb
@@ -19,5 +19,8 @@ do_configure_prepend() {
 
 do_stage() {
 	install -m 0755 sip ${STAGING_BINDIR}/sip4
+	cd ${WORKDIR}/sip-${PV} && python configure.py
+	install -d ${STAGING_PYDIR}/site-packages
+	install -m 0755 sip*.py ${STAGING_PYDIR}/site-packages
 }