merge of 'ae5744fa10248e83339259dfc0764f954c5b3456'

     and 'd2ff855675080c5ae36403d11904698712868163'

88 files changed, 265 insertions, 351 deletions

diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 10c8c01ad0..951be7fc31 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -14,10 +14,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://extreplychars.patch;patch=1 \
            file://getopt-wait-interpreter-ready.patch;patch=1 \
            file://tihtc-csq-fix.patch;patch=1 \
-           file://universal-wcdma.patch;patch=1 \
-           file://mlbuf-in-gsmd-struct.patch;patch=1 \
-           file://libgsmd-tool-fix.patch;patch=1 \
-           file://sms-hacks.patch;patch=1"
+           file://universal-wcdma.patch;patch=1"
 S = "${WORKDIR}/gsm"
 
 inherit autotools pkgconfig update-rc.d
diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb
index 751f4a4113..ecee0bf91a 100644
--- a/packages/gtk+/gtk+_2.10.14.bb
+++ b/packages/gtk+/gtk+_2.10.14.bb
@@ -1,6 +1,6 @@
 require gtk-2.10.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc
index 4ed214cfd3..463243554c 100644
--- a/packages/gtk+/gtk-2.10.inc
+++ b/packages/gtk+/gtk-2.10.inc
@@ -13,18 +13,20 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${bindir}/gtk-query-immodules-2.0 \
 	${libdir}/lib*.so.* \
 	${datadir}/themes ${sysconfdir} \
-	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
+	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so \
 FILES_${PN}-dev += " \
         ${datadir}/gtk-2.0/include \
         ${libdir}/gtk-2.0/include \
         ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
         ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
         ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+	${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \
         ${bindir}/gdk-pixbuf-csource"
 FILES_${PN}-dbg += " \
         ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
         ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
-        ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
+        ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
+	${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
 
 
 NEATSTUFF = " ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm "
diff --git a/packages/gtk-webcore/osb-jscore_20060212.bb b/packages/gtk-webcore/osb-jscore_20070816.bb
index b5aa879a18..b5aa879a18 100644
--- a/packages/gtk-webcore/osb-jscore_20060212.bb
+++ b/packages/gtk-webcore/osb-jscore_20070816.bb
diff --git a/packages/gtk-webcore/osb-nrcit_20060212.bb b/packages/gtk-webcore/osb-nrcit_20070816.bb
index 3bfec98924..3bfec98924 100644
--- a/packages/gtk-webcore/osb-nrcit_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcit_20070816.bb
diff --git a/packages/gtk-webcore/osb-nrcore_20060212.bb b/packages/gtk-webcore/osb-nrcore_20070816.bb
index 991af8d24d..991af8d24d 100644
--- a/packages/gtk-webcore/osb-nrcore_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcore_20070816.bb
diff --git a/packages/moin/moin_1.2.2.bb b/packages/moin/moin_1.5.8.bb
index ae275c7f98..7efe66eb14 100644
--- a/packages/moin/moin_1.2.2.bb
+++ b/packages/moin/moin_1.5.8.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "A full fledged WikiWiki system written in Python"
 LICENSE = "GPL"
-SECTION = "base"
+SECTION = "network"
+HOMEPAGE = "http://moinmoin.wikiwikiweb.de/"
 PRIORITY = "optional"
-PR = "r1"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/moin/moin-${PV}.tar.gz"
 
diff --git a/packages/python/python-egenix-mx-base_2.0.6.bb b/packages/nonworking/python/python-egenix-mx-base_2.0.6.bb
index b31cd20cad..b31cd20cad 100644
--- a/packages/python/python-egenix-mx-base_2.0.6.bb
+++ b/packages/nonworking/python/python-egenix-mx-base_2.0.6.bb
diff --git a/packages/python/python-m2crypto-0.13.1/.mtn2git_empty b/packages/nonworking/python/python-m2crypto/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-m2crypto-0.13.1/.mtn2git_empty
+++ b/packages/nonworking/python/python-m2crypto/.mtn2git_empty
diff --git a/packages/python/python-m2crypto-0.13.1/0.13p1.patch b/packages/nonworking/python/python-m2crypto/0.13p1.patch
index ad359185e6..ad359185e6 100644
--- a/packages/python/python-m2crypto-0.13.1/0.13p1.patch
+++ b/packages/nonworking/python/python-m2crypto/0.13p1.patch
diff --git a/packages/python/python-m2crypto_0.13.1.bb b/packages/nonworking/python/python-m2crypto_0.18.bb
index 009345e5a0..009345e5a0 100644
--- a/packages/python/python-m2crypto_0.13.1.bb
+++ b/packages/nonworking/python/python-m2crypto_0.18.bb
diff --git a/packages/ntop/ntop-3.0/autotools.patch b/packages/ntop/ntop-3.0/autotools.patch
index e40735c681..07ed6afd62 100644
--- a/packages/ntop/ntop-3.0/autotools.patch
+++ b/packages/ntop/ntop-3.0/autotools.patch
@@ -1,6 +1,16 @@
---- tmp/base/ntop-3.0-r0/ntop-3.0/acinclude.m4	2004-03-09 12:19:57.000000000 -0500
-+++ ntop-3.0/acinclude.m4	2004-03-09 12:19:57.000000000 -0500
-@@ -205,433 +205,3 @@
+--- ntop-3.0/acinclude.m4	2007/03/15 23:08:29	1.1
++++ ntop-3.0/acinclude.m4	2007/03/15 23:08:43
+@@ -34,6 +34,9 @@
+ dnl>    #undef HAVE_<typedef>
+ dnl>
+ 
++LIBTOOL='$host_alias-libtool'
++AC_SUBST(LIBTOOL)dnl
++
+ AC_DEFUN([AC_CHECK_TYPEDEF],[dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+ AC_MSG_CHECKING(for typedef $1)
+@@ -205,433 +208,3 @@
  fi
  # Finished expansion of NTOPCONFIGDEBUG_SETTINGS()
  ])
@@ -434,8 +444,8 @@
 -
 -dnl This is just to silence aclocal about the macro not being used
 -ifelse([AC_DISABLE_FAST_INSTALL])dnl
---- tmp/base/ntop-3.0-r0/ntop-3.0/configure.in	2004-03-21 18:45:04.000000000 -0500
-+++ ntop-3.0/configure.in	2004-05-22 14:20:07.000000000 -0400
+--- ntop-3.0/configure.in	2007/03/15 23:08:29	1.1
++++ ntop-3.0/configure.in	2007/03/15 23:08:34
 @@ -190,7 +190,6 @@
  AC_PROG_INSTALL
  AC_PROG_LN_S
diff --git a/packages/ntop/ntop_3.0.bb b/packages/ntop/ntop_3.0.bb
index 051b5beb91..aa725222e9 100644
--- a/packages/ntop/ntop_3.0.bb
+++ b/packages/ntop/ntop_3.0.bb
@@ -3,6 +3,7 @@ DESCRIPTION = "ntop is network top"
 SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "gdbm zlib libpcap libpng gd"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tgz \
            file://${FILESDIR}/autotools.patch;patch=1 \
@@ -25,11 +26,13 @@ EXTRA_OECONF += " --without-ssl \
 FILES_ntop_append = " ${libdir}/ntop/plugins/*.so ${libdir}/libntop-*.so \
                        ${libdir}/libntopreport-*.so"
 FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so ${libdir}/libntopreport.so \
-                   ${libdir}/libntop.a ${libdir}/libntopreport.a ${libdir}/*.la"
+                   ${libdir}/*.a ${libdir}/libntopreport.a ${libdir}/*.la"
+FILES_${PN}-dbg += "${libdir}/ntop/plugins/.debug"
 
-do_configure () {
+do_configure_prepend () {
 	if [ ! -e acinclude.m4 ]; then
 		mv acinclude.m4.ntop acinclude.m4
 	fi
-	autotools_do_configure
+	rm -f libtool
+	cp ${STAGING_BINDIR_NATIVE}/${TARGET_SYS}-libtool libtool
 }
diff --git a/packages/python/python-cairo_cvs.bb b/packages/python/python-cairo_cvs.bb
deleted file mode 100644
index 53cbd93030..0000000000
--- a/packages/python/python-cairo_cvs.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Python Cairo Bindings"
-SECTION = "devel/python"
-PRIORITY = "optional"
-DEPENDS = "python-pygtk cairo"
-SRCNAME = "pycairo"
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "LGPL MPL"
-inherit autotools
-
-SRC_URI = "cvs://anoncvs@cvs.cairographics.org/cvs/cairo;module=pycairo"
-S = "${WORKDIR}/${SRCNAME}"
-
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
diff --git a/packages/python/python-formencode_0.4.bb b/packages/python/python-formencode_svn.bb
index 40e1f3e359..b1cf3ce7c7 100644
--- a/packages/python/python-formencode_0.4.bb
+++ b/packages/python/python-formencode_svn.bb
@@ -4,10 +4,12 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "sqlite3"
 SRCNAME = "FormEncode"
+PV = "0.4+svn${SRCDATE}"
+PR = "ml0"
 
 inherit distutils
 
-SRC_URI = "http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-${PV}.tar.gz \
-file://setup.py.diff;patch=1"
+SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http \
+           file://setup.py.diff;patch=1"
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${WORKDIR}/trunk"
diff --git a/packages/python/python-gst_0.10.7.bb b/packages/python/python-gst_0.10.8.bb
index 8924c700d4..0de7dc81e9 100644
--- a/packages/python/python-gst_0.10.7.bb
+++ b/