merge of 336c2756d6daa832106c29d9ab7c874fcd6815d7

     and cb591f5b883733fa2368b93267c8b93a727fa2c7

18 files changed, 53 insertions, 94 deletions

diff --git a/packages/esmtp/esmtp_0.4.1.bb b/packages/esmtp/esmtp_0.5.1.bb
index 081c7ab208..2ab587a505 100644
--- a/packages/esmtp/esmtp_0.4.1.bb
+++ b/packages/esmtp/esmtp_0.5.1.bb
@@ -1,10 +1,10 @@
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "libesmtp"
 DESCRIPTION = "ESMTP is a user-configurable relay-only MTA \
 with a sendmail-compatible syntax, based on libESMTP and \
 supporting the AUTH (including the CRAM-MD5 and NTLM SASL \
 mechanisms) and StartTLS SMTP extensions."
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "libesmtp"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/esmtp/esmtp-${PV}.tar.bz2"
 
diff --git a/packages/irk/irk-belkin_0.11.bb b/packages/irk/irk-belkin_0.11.bb
index b743544903..e543ebdcc5 100644
--- a/packages/irk/irk-belkin_0.11.bb
+++ b/packages/irk/irk-belkin_0.11.bb
@@ -5,5 +5,5 @@ RCONFLICTS = "irk-targus"
 RREPLACES = "irk-targus"
 PR = "r3"
 
-SRC_URI = "http://kopsisengineering.com/irk-current.tgz \
+SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-current.tgz \
            file://install-default-conf.patch;patch=1"
diff --git a/packages/irk/irk-targus_0.11.0.bb b/packages/irk/irk-targus_0.11.0.bb
index 1b130776a8..87b74cb5eb 100644
--- a/packages/irk/irk-targus_0.11.0.bb
+++ b/packages/irk/irk-targus_0.11.0.bb
@@ -7,5 +7,5 @@ HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php"
 RCONFLICTS = "irk-belkin"
 RREPLACES = "irk-belkin"
 
-SRC_URI = "http://angela1.data-uncertain.co.uk/~zaurus/irk-${PV}.tgz \
+SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-${PV}.tgz \
            file://install-default-conf.patch;patch=1"
diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc
index ea308f1043..2d536b3dea 100644
--- a/packages/kaffe/kaffe.inc
+++ b/packages/kaffe/kaffe.inc
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.kaffe.org/"
 LICENSE  = "GPL LGPL W3C Classpath BSD"
 
 DEPENDS = "jikes-native fastjar-native libffi zip-native"
+RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
 
 SRC_URI += "file://disable-automake-checks.patch;patch=1"
 
@@ -45,7 +46,6 @@ oe_runconf () {
 
 PACKAGES =+ "${PN}-common"
 FILES_${PN} += "${libdir}/${PN}"
-RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
 FILES_${PN}-common = "${libdir}/${PN}/jre/lib/*.jar"
 
 do_install () {
diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb
index 54737ce8f6..d4d6287592 100644
--- a/packages/kaffe/kaffeh-native_1.1.5.bb
+++ b/packages/kaffe/kaffeh-native_1.1.5.bb
@@ -4,6 +4,8 @@ PR = "r3"
 
 require kaffe.inc
 
+RDEPENDS_${PN} = ""
+
 inherit native
 
 EXTRA_OECONF = "--disable-alsatest \
diff --git a/packages/libesmtp/libesmtp-1.0.1/configure.patch b/packages/libesmtp/libesmtp-1.0.1/configure.patch
deleted file mode 100644
index 5058db4b99..0000000000
--- a/packages/libesmtp/libesmtp-1.0.1/configure.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libesmtp-1.0.1/configure.in~configure	2003-09-11 17:23:26.000000000 -0400
-+++ libesmtp-1.0.1/configure.in	2004-01-20 11:59:35.000000000 -0500
-@@ -231,7 +231,7 @@
- 	if test x$enable_emulate_getaddrinfo != xyes ; then
- 		AC_MSG_ERROR([getaddrinfo not found: try --with-lwres or --enable-emulate-getaddrinfo])
- 	fi
--	LIBOBJS="$LIBOBJS getaddrinfo.o"
-+	AC_LIBOBJ([getaddrinfo])
- fi
- 
- if test x"$enable_emulate_getaddrinfo" != xno ; then
-@@ -259,7 +259,7 @@
- 	AC_SEARCH_LIBS(gethostbyname, resolv bind nsl, ,
- 		       [AC_MSG_ERROR([cannot find gethostbyname])])
-     fi
--    LIBOBJS="$LIBOBJS gethostbyname.o"
-+    AC_LIBOBJ([gethostbyname])
- 
-     AC_CACHE_CHECK([for IPv6 support], acx_cv_sys_use_ipv6, [
- 	    AC_TRY_COMPILE([
-@@ -572,7 +572,7 @@
- dnl #########################################################################
- dnl Check that snprintf works correctly.
- dnl #########################################################################
--ACX_SNPRINTF(,[LIBOBJS="$LIBOBJS snprintf.o"])
-+ACX_SNPRINTF(,[AC_LIBOBJ([snprintf])])
- 
- dnl #########################################################################
- dnl Make substitutions
-@@ -588,8 +588,8 @@
- AC_SUBST(RANLIB)
- AC_SUBST(subdirs)
- 
--LTLIBOBJS=`echo "$LIBOBJS" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']`
--AC_SUBST(LTLIBOBJS)
-+#LTLIBOBJS=`echo "$LIBOBJS" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']`
-+#AC_SUBST(LTLIBOBJS)
- LTALLOCA=`echo "$ALLOCA" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']`
- AC_SUBST(LTALLOCA)
- 
diff --git a/packages/libesmtp/libesmtp_1.0.1.bb b/packages/libesmtp/libesmtp_1.0.1.bb
deleted file mode 100644
index fe6d958f1b..0000000000
--- a/packages/libesmtp/libesmtp_1.0.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SECTION = "libs"
-DEPENDS = "openssl"
-DESCRIPTION = "LibESMTP is a library to manage posting \
-(or submission of) electronic mail using SMTP to a \
-preconfigured Mail Transport Agent (MTA) such as Exim."
-FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
-
-SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2  \
-           file://configure.patch;patch=1"
-LICENSE = "LGPL GPL"
-inherit autotools 
-
-EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
-
-do_stage () {
-	oe_libinstall -a -so libesmtp ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}
-	install -m 644 auth-client.h ${STAGING_INCDIR}
-	install -m 644 auth-plugin.h ${STAGING_INCDIR}
-	install -m 644 libesmtp.h ${STAGING_INCDIR}
-}
diff --git a/packages/libesmtp/libesmtp_1.0.3r1.bb b/packages/libesmtp/libesmtp_1.0.4.bb
index baff0d8931..294333c579 100644
--- a/packages/libesmtp/libesmtp_1.0.3r1.bb
+++ b/packages/libesmtp/libesmtp_1.0.4.bb
@@ -1,22 +1,19 @@
-LICENSE = "GPL"
-SECTION = "libs"
-DEPENDS = "openssl"
 DESCRIPTION = "LibESMTP is a library to manage posting \
 (or submission of) electronic mail using SMTP to a \
-preconfigured Mail Transport Agent (MTA) such as Exim."
-FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
+preconfigured Mail Transport Agent (MTA) such as Exim or PostFix."
+LICENSE = "GPL"
+SECTION = "libs/network"
+DEPENDS = "openssl"
+PR = "r1"
 
 SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2"
 
-inherit autotools 
+inherit autotools binconfig
 
 EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
 
-do_stage () {
-	oe_libinstall -a -so libesmtp ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}
-	install -m 644 auth-client.h ${STAGING_INCDIR}
-	install -m 644 auth-plugin.h ${STAGING_INCDIR}
-	install -m 644 libesmtp.h ${STAGING_INCDIR}
+do_stage() {
+	autotools_stage_all
 }
+
+FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
diff --git a/packages/netbase/netbase/tosa/interfaces b/packages/netbase/netbase/tosa/interfaces
index 92b022475c..0da7168535 100644
--- a/packages/netbase/netbase/tosa/interfaces
+++ b/packages/netbase/netbase/tosa/interfaces
@@ -9,8 +9,8 @@ iface wlan0 inet dhcp
   wireless_type wlan-ng
   wireless_mode Managed
   pre-up modprobe prism2_usb
-  pre-up /sbin/usbctl on 1
-  post-down /sbin/usbctl off 1
+#  pre-up /sbin/usbctl on 1
+#  post-down /sbin/usbctl off 1
   post-down rmmod prism2_usb
 
 # Wired or wireless interfaces
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
index 7654ebd9a3..ca0beacb47 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
@@ -4,4 +4,3 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
 
-EXTRA_QMAKEVARS_POST += "HEADERS+=rssparser.h SOURCES+=rssparser.cpp"
diff --git a/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty b/packages/rt2x00/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty
+++ b/packages/rt2x00/.mtn2git_empty
diff --git a/packages/rt2x00/rt2570_1.1.0-b2.bb b/packages/rt2x00/rt2570_1.1.0-b2.bb
new file mode 100644
index 0000000000..a3cc233351
--- /dev/null
+++ b/packages/rt2x00/rt2570_1.1.0-b2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Driver for Ralink rt2570 USB 802.11g WiFi sticks"
+HOMEPAGE = "http://rt2x00.serialmonkey.com/"
+SECTION = "kernel/modules"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/rt2400/rt2570-${PV}.tar.gz"
+
+inherit module
+
+S = "${WORKDIR}/${PN}-${PV}/Module/"
+
+EXTRA_OEMAKE = "KERNDIR=${STAGING_KERNEL_DIR}"
+
+do_install() {
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+	install -m 0644 rt2570${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/
+}
diff --git a/packages/slcalc/slcalc_1.2.1.bb b/packages/slcalc/slcalc_1.2.1.bb
index fa5720e0ce..a399defb76 100644
--- a/packages/slcalc/slcalc_1.2.1.bb
+++ b/packages/slcalc/slcalc_1.2.1.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Scientific calculator with user definable constants and functions
 HOMEPAGE = "http://homepage3.nifty.com/cam/slcalc.htm"
 SECTION = "opie/applications"
 LICENSE = "GPL"
+PR = "r1"
 
 APPTYPE = "binary"
 APPDESKTOP = "${S}"
@@ -14,5 +15,5 @@ S = "${WORKDIR}/slcalc_source"
 
 do_install() {
 	install -d ${D}${palmtopdir}/pics
-	install -m 0644 slcalc2.png ${D}${palmtopdir}/pics/
+	install -m 0644 slcalc2.png ${D}${palmtopdir}/pics/slcalc.png
 }
diff --git a/packages/sudo/sudo.inc b/packages/sudo/sudo.inc
index 92d3c47266..0dfb22ba8a 100644
--- a/packages/sudo/sudo.inc
+++ b/packages/sudo/sudo.inc
@@ -1,4 +1,3 @@
-SECTION = "base"
 DESCRIPTION = "Sudo (superuser do) allows a system \
 administrator to give certain users (or groups of \
 users) the ability to run some (or all) commands \
diff --git a/packages/swig/swig-native_1.3.29.bb b/packages/swig/swig-native_1.3.29.bb
new file mode 100644
index 0000000000..8210bb9cfb
--- /dev/null
+++ b/packages/swig/swig-native_1.3.29.bb
@@ -0,0 +1,7 @@
+require swig_${PV}.bb
+inherit native
+
+do_stage() {
+	oe_runmake install PREFIX=${STAGING_BINDIR}/..
+}
+
diff --git a/packages/tasks/task-dvb.bb b/packages/tasks/task-dvb.bb
index 5a5c37a565..335ab27e8d 100644
--- a/packages/tasks/task-dvb.bb
+++ b/packages/tasks/task-dvb.bb
@@ -7,3 +7,6 @@ PR = "r5"
 RDEPENDS = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-module-via"
 
 LICENSE = MIT
+
+# there is a -march=586 somewhere in the source tree of mythtv
+COMPATIBLE_HOST = 'i.86.*-linux'
diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb
index a1532c1739..a938a12e57 100644
--- a/packages/tasks/task-mythfront.bb
+++ b/packages/tasks/task-mythfront.bb
@@ -7,3 +7,6 @@ PR = "r6"
 RDEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-module-via ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd drm-module-drm"
 
 LICENSE = MIT
+
+# there is a -march=586 somewhere in the source tree of mythtv
+COMPATIBLE_HOST = 'i.86.*-linux'
diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb
index d5a8e70332..0c7a77e7f9 100644
--- a/packages/xqt/xqt_0.0.9.bb
+++ b/packages/xqt/xqt_0.0.9.bb
@@ -2,15 +2,13 @@ HOMEPAGE = "http://xqt.sourceforge.jp"
 LICENSE = "GPL"
 SECTION = "x11"
 
-
 SRCDATE = "20041111"
-DEPENDS = "freetype libxi libxmu flex-2.5.4-native virtual/libqte2 libqpe-opie"
+DEPENDS = "freetype libxi libxmu flex-native virtual/libqte2 libqpe-opie"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xc;method=pserver \
 	   file://imake-staging.patch;patch=1 \
 	   file://moc_call.patch;patch=1 "
 
-
 S = "${WORKDIR}/xc"
 
 do_configure() {