88 files changed, 267 insertions, 350 deletions
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/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb
index 969fd55f0e..8688725bd7 100644
--- a/packages/linux/linux-x86_2.6.20.bb
+++ b/packages/linux/linux-x86_2.6.20.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Linux Kernel for x86 compatible machines"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " 
 
 SRC_URI_append_x86 = "file://i486-defconfig"
-SRC_URI_append_i586-generic = "file://i586-defconfig"
-SRC_URI_append_i686-generic = "file://i686-defconfig"
+SRC_URI_append_i586 = "file://i586-defconfig"
+SRC_URI_append_i686 = "file://i686-defconfig"
 
 
 S = "${WORKDIR}/linux-${PV}"
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/packages/python/python-gst_0.10.8.bb
@@ -2,11 +2,10 @@ DESCRIPTION = "Python Gstreamer bindings"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gstreamer gst-plugins-base python-pygobject"
-PR = "r1"
+PR = "ml0"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
            file://python-path.patch;patch=1"
-
 S = "${WORKDIR}/gst-python-${PV}"
 
 inherit autotools distutils-base pkgconfig
diff --git a/packages/python/python-imaging_1.1.5.bb b/packages/python/python-imaging_1.1.6.bb
index 11b0705593..9f3b6323dd 100644
--- a/packages/python/python-imaging_1.1.5.bb
+++ b/packages/python/python-imaging_1.1.6.bb
@@ -5,30 +5,24 @@ LICENSE = "GPL"
 DEPENDS = "freetype jpeg tiff"
 RDEPENDS = "python-lang python-stringold"
 SRCNAME = "Imaging"
-
-PR = "r1"
+PR = "ml0"
 
 SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
-file://path.patch;patch=1"
-
+           file://path.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
 do_compile() {
-
     export STAGING_LIBDIR=${STAGING_LIBDIR}
     export STAGING_INCDIR=${STAGING_INCDIR}
     distutils_do_compile
 }
 
 do_install() {
-
     export STAGING_LIBDIR=${STAGING_LIBDIR}
     export STAGING_INCDIR=${STAGING_INCDIR}
-
     distutils_do_install
-
     install -d ${D}${datadir}/doc/${PN}/html/
     install -m 0644 ${S}/README ${D}${datadir}/doc/${PN}/
     install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/
diff --git a/packages/python/python-imdbpy_2.5.bb b/packages/python/python-imdbpy_3.1.bb
index b42c3c48d9..72d30fb89b 100644
--- a/packages/python/python-imdbpy_2.5.bb
+++ b/packages/python/python-imdbpy_3.1.bb
@@ -1,12 +1,14 @@
 DESCRIPTION = "IMDbPY is a Python package useful to retrieve and manage the data of the IMDb movie database."
 SECTION = "devel/python"
+HOMEPAGE = "http://imdbpy.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "IMDbPY"
 PR = "ml0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/imdbpy/imdbpy-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/imdbpy/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/imdb/parser/common/.debug"
diff --git a/packages/python/python-numarray_1.1.1.bb b/packages/python/python-numarray_1.1.1.bb
index 4bc084c68a..e4ff40849f 100644
--- a/packages/python/python-numarray_1.1.1.bb
+++ b/packages/python/python-numarray_1.1.1.bb
@@ -3,8 +3,12 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PYRAF"
 SRCNAME = "numarray"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+# *sigh*
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/numarray/examples/*/.debug"
diff --git a/packages/python/python-pycairo/fix-pkgconfig-dir.patch b/packages/python/python-pycairo/fix-pkgconfig-dir.patch
deleted file mode 100644
index 15f4b3d786..0000000000
--- a/packages/python/python-pycairo/fix-pkgconfig-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pycairo-1.2.2/setup.py
-===================================================================
---- pycairo-1.2.2.orig/setup.py
-+++ pycairo-1.2.2/setup.py
-@@ -57,7 +57,7 @@ dic.setup(
-     )
- 
- pkgconfig_dir  = os.path.join (sys.prefix, 'lib', 'pkgconfig')
--pkgconfig_file = os.path.join (pkgconfig_dir, 'pycairo.pc')
-+pkgconfig_file = os.path.join ('.', 'pycairo.pc')
- print 'creating %s' % pkgconfig_file
- fo = file (pkgconfig_file, 'w')
- fo.write ("""\
diff --git a/packages/python/python-pycairo_1.2.2.bb b/packages/python/python-pycairo_1.4.0.bb
index 22ba095aa2..0a20010be6 100644
--- a/packages/python/python-pycairo_1.2.2.bb
+++ b/packages/python/python-pycairo_1.4.0.bb
@@ -3,10 +3,9 @@ SECTION = "python-devel"
 HOMEPAGE = "http://cairographics.org/pycairo"
 LICENSE = "LGPL MPL"
 DEPENDS = "cairo"
-PR = "ml2"
+PR = "ml0"
 
-SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \
-           file://fix-pkgconfig-dir.patch;patch=1"
+SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz"
 S = "${WORKDIR}/pycairo-${PV}"
 
 inherit distutils pkgconfig
diff --git a/packages/python/python-pyfits_1.0.1.bb b/packages/python/python-pyfits_1.1.bb
index a8d336005a..9eb3d63969 100644
--- a/packages/python/python-pyfits_1.0.1.bb
+++ b/packages/python/python-pyfits_1.1.bb
@@ -1,12 +1,13 @@
 DESCRIPTION = "PyFITS provides an interface to FITS formatted files under the Python scripting language."
 HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyfits"
 AUTHOR = "Space Telescope Science Institute"
+# Warning: pyfits will require python-numpy in 2008
 RDEPENDS = "python-numarray"
 SECTION = "devel/python"
 LICENSE = "AURA"
 PR = "ml0"
 
-SRC_URI = "ftp://ra.stsci.edu/pub/pyfits/pyfits-${PV}.tar.gz"
-S = "${WORKDIR}/pyfits-${PV}"
+SRC_URI = "http://www.stsci.edu/resources/software_hardware/pyfits/pyfits-${PV}.tar.gz"
+S = "${WORKDIR}/pyfits"
 
 inherit distutils
diff --git a/packages/python/python-pyflakes_0.2.0.bb b/packages/python/python-pyflakes_0.2.1.bb
index c78bccb589..306c6d64e9 100644
--- a/packages/python/python-pyflakes_0.2.0.bb
+++ b/packages/python/python-pyflakes_0.2.1.bb
@@ -1,8 +1,10 @@
-DESCRIPTION = "SourceCode Test Utility"
+DESCRIPTION = "Python Source-Code Testing Utility"
 SECTION = "devel/python"
+HOMEPAGE = "http://divmod.org/projects/pyflakes"
 PRIORITY = "optional"
 LICENSE = "BSD"
 SRCNAME = "pyflakes"
+PR = "ml0"
 
 SRC_URI = "http://www.divmod.org/static/projects/pyflakes/pyflakes-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pygame_1.6.bb b/packages/python/python-pygame_1.6.bb
deleted file mode 100644
index 7d76a9ac99..0000000000
--- a/packages/python/python-pygame_1.6.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Python libSDL Bindings"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-RDEPENDS = "python-core python-numeric"
-DEPENDS = "virtual/libsdl libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
-SRCNAME = "pygame"
-
-SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}.tar.gz \
-           file://qpe.patch;patch=1 \
-           file://Setup"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-do_configure_prepend() {
-	SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >Setup
-        cat ${WORKDIR}/Setup >>Setup
-}
diff --git a/packages/python/python-pygame_1.7.1.bb b/packages/python/python-pygame_1.7.1.bb
index a664c0ea0a..37b73148e6 100644
--- a/packages/python/python-pygame_1.7.1.bb
+++ b/packages/python/python-pygame_1.7.1.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Python libSDL Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-RDEPENDS = "python-core python-numeric libsdl-x11"
-DEPENDS = "virtual/libsdl libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
+RDEPENDS = "python-numeric"
+DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
 SRCNAME = "pygame"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}release.tar.gz \
            file://Setup"
@@ -15,5 +15,5 @@ inherit distutils
 
 do_configure_prepend() {
 	SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >Setup
-        cat ${WORKDIR}/Setup >>Setup
+	cat ${WORKDIR}/Setup >>Setup
 }
diff --git a/packages/python/python-pygoogle_0.6.bb b/packages/python/python-pygoogle_0.6.bb
index 87e264be6b..2682d4ffd8 100644
--- a/packages/python/python-pygoogle_0.6.bb
+++ b/packages/python/python-pygoogle_0.6.bb
@@ -2,10 +2,12 @@ DESCRIPTION = "This module is a wrapper for the Google Web APIs. \
 It allows you to do Google searches, retrieve pages from the \
 Google cache, and ask Google for spelling suggestions."
 SECTION = "devel/python"
+HOMEPAGE = "http://pygoogle.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "PSF"
-RDEPENDS = "python-core python-soappy"
+RDEPENDS = "python-soappy"
 SRCNAME = "pygoogle"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pygtk_0.6.12.bb b/packages/python/python-pygtk-1.2_0.6.12.bb
index 20504f1108..3b538ef83e 100644
--- a/packages/python/python-pygtk_0.6.12.bb
+++ b/packages/python/python-pygtk-1.2_0.6.12.bb
@@ -1,11 +1,11 @@
-DESCRIPTION = "Python GTK+ 1.2 Bindings"
+DESCRIPTION = "Python Bindings for GTK+ 1.2"
 HOMEPAGE = "http://www.gtk.org"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gtk+-1.2"
 RDEPENDS = "python-shell python-re"
 SRCNAME = "pygtk"
-PR = "r0"
+PR = "ml0"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
            file://remove-imlib-et-al;patch=1"
diff --git a/packages/python/python-pycairo/.mtn2git_empty b/packages/python/python-pygtk/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pycairo/.mtn2git_empty
+++ b/packages/python/python-pygtk/.mtn2git_empty
diff --git a/packages/python/python-pygtk2/acinclude.m4 b/packages/python/python-pygtk/acinclude.m4
index 53518fb2eb..53518fb2eb 100644
--- a/packages/python/python-pygtk2/acinclude.m4
+++ b/packages/python/python-pygtk/acinclude.m4
diff --git a/packages/python/python-pygtk2/fix-gtkunixprint.patch b/packages/python/python-pygtk/fix-gtkunixprint.patch
index dca19ce5ed..dca19ce5ed 100644
--- a/packages/python/python-pygtk2/fix-gtkunixprint.patch
+++ b/packages/python/python-pygtk/fix-gtkunixprint.patch
diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk_2.10.3.bb
index ad1f36a205..ad1f36a205 100644
--- a/packages/python/python-pygtk2_2.10.3.bb
+++ b/packages/python/python-pygtk_2.10.3.bb
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
new file mode 100644
index 0000000000..c8c45b3c74
--- /dev/null
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "Python GTK+ 2.10.x Bindings"
+SECTION = "devel/python"
+# needs gtk+ 2.10.x
+DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
+RDEPENDS = "python-shell"
+SRCNAME = "pygtk"
+LICENSE = "LGPL"
+PR = "ml1"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
+           file://fix-gtkunixprint.patch;patch=1 \
+           file://acinclude.m4"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+EXTRA_OECONF = "--disable-docs"
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+inherit autotools pkgconfig distutils-base
+
+do_configure_prepend() {
+    install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+
+PACKAGES =+ "${PN}-dev"
+FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
+FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+require fix-path.inc
+PACKAGES =+ "${PN}-dev"
+FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
+FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/*/.debug"
+FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
+
+do_stage() {
+	autotools_stage_includes
+	sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
+	install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
+	install -d ${STAGING_DATADIR}/pygtk/2.0/codegen
+	install -d ${STAGING_DATADIR}/pygtk/2.0/defs/
+	cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/
+	cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
+	cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
+}
diff --git a/packages/python/python-pygtk2_2.6.3.bb b/packages/python/python-pygtk_2.6.3.bb
index 417de0a109..417de0a109 100644
--- a/packages/python/python-pygtk2_2.6.3.bb
+++ b/packages/python/python-pygtk_2.6.3.bb
diff --git a/packages/python/python-pygtk2_2.8.6.bb b/packages/python/python-pygtk_2.8.6.bb
index 361737684c..361737684c 100644
--- a/packages/python/python-pygtk2_2.8.6.bb
+++ b/packages/python/python-pygtk_2.8.6.bb
diff --git a/packages/python/python-pygtk2/.mtn2git_empty b/packages/python/python-pyiw-0.3.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pygtk2/.mtn2git_empty
+++ b/packages/python/python-pyiw-0.3.3/.mtn2git_empty
diff --git a/packages/python/python-pyiw-0.3.2/Makefile b/packages/python/python-pyiw-0.3.3/Makefile
index 2ea7baec08..2ea7baec08 100644
--- a/packages/python/python-pyiw-0.3.2/Makefile
+++ b/packages/python/python-pyiw-0.3.3/Makefile
diff --git a/packages/python/python-pyiw_0.3.2.bb b/packages/python/python-pyiw_0.3.3.bb
index aa86a07e8f..aa86a07e8f 100644
--- a/packages/python/python-pyiw_0.3.2.bb
+++ b/packages/python/python-pyiw_0.3.3.bb
diff --git a/packages/python/python-pylinda_0.6.bb b/packages/python/python-pylinda_0.6.bb
index ef557ccca7..082f74ac47 100644
--- a/packages/python/python-pylinda_0.6.bb
+++ b/packages/python/python-pylinda_0.6.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "Python Implementation of Linda Tuple Space"
 SECTION = "devel/python"
+HOMEPAGE = "http://www-users.cs.york.ac.uk/~aw/pylinda/"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 SRCNAME = "linda"
diff --git a/packages/python/python-pylint_0.3.3.bb b/packages/python/python-pylint_0.13.2.bb
index bd93ea4084..d0640607f0 100644
--- a/packages/python/python-pylint_0.3.3.bb
+++ b/packages/python/python-pylint_0.13.2.bb
@@ -3,13 +3,14 @@ pychecker since nearly all tests you can do with PyChecker can also be done with
 features, like checking line-code's length, checking if variable names are well-formed according to your coding standard,\
 or checking if declared interfaces are truly implemented, and much more."
 SECTION = "devel/python"
+HOMEPAGE = "http://www.logilab.org/857"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "python-core python-logilab"
+RDEPENDS = "python-logilab-common"
 SRCNAME = "pylint"
+PR = "ml0"
 
 SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
-
diff --git a/packages/python/python-pyiw-0.3.2/.mtn2git_empty b/packages/python/python-pyqt/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pyiw-0.3.2/.mtn2git_empty
+++ b/packages/python/python-pyqt/.mtn2git_empty
diff --git a/packages/python/python-pyqt4/cross-compile.patch b/packages/python/python-pyqt/cross-compile.patch
index fb1524c09d..fb1524c09d 100644
--- a/packages/python/python-pyqt4/cross-compile.patch
+++ b/packages/python/python-pyqt/cross-compile.patch
diff --git a/packages/python/python-pyqt4_4.2.bb b/packages/python/python-pyqt_4.2.bb
index 64a9a71f68..64a9a71f68 100644
--- a/packages/python/python-pyqt4_4.2.bb
+++ b/packages/python/python-pyqt_4.2.bb
diff --git a/packages/python/python-pyraf_1.2.1.bb b/packages/python/python-pyraf_1.4.bb
index 0c9f12a69e..af267cfa9e 100644
--- a/packages/python/python-pyraf_1.2.1.bb
+++ b/packages/python/python-pyraf_1.4.bb
@@ -6,8 +6,8 @@ SECTION = "devel/python"
 LICENSE = "AURA"
 PR = "ml0"
 
-SRC_URI = "ftp://ra.stsci.edu/pub/pyraf/v2.3/pyraf-${PV}.tar.gz"
-S = "${WORKDIR}/pyraf-${PV}"
+SRC_URI = "ftp://ra.stsci.edu/pub/pyraf/v2.5/pyraf-${PV}.tar.gz"
+S = "${WORKDIR}/pyraf"
 
 inherit distutils
 
diff --git a/packages/python/python-pyqt-3.13/.mtn2git_empty b/packages/python/python-pyreverse/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pyqt-3.13/.mtn2git_empty
+++ b/packages/python/python-pyreverse/.mtn2git_empty
diff --git a/packages/python/python-pyreverse/fix-future.patch b/packages/python/python-pyreverse/fix-future.patch
new file mode 100644
index 0000000000..2bcba0dd39
--- /dev/null
+++ b/packages/python/python-pyreverse/fix-future.patch
@@ -0,0 +1,16 @@
+Index: pyreverse-0.5.2/setup.py
+===================================================================
+--- pyreverse-0.5.2.orig/setup.py
++++ pyreverse-0.5.2/setup.py
+@@ -17,10 +17,10 @@
+ # this program; if not, write to the Free Software Foundation, Inc.,
+ # 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ """ Generic Setup script, takes package info from __pkginfo__.py file """
++from __future__ import nested_scopes
+ 
+ __revision__ = '$Id: setup.py,v 1.17 2005/01/05 11:40:41 syt Exp $'
+ 
+-from __future__ import nested_scopes
+ import os
+ import sys
+ import shutil
diff --git a/packages/python/python-pyreverse_0.5.0.bb b/packages/python/python-pyreverse_0.5.2.bb
index ab7322e9e8..9194df5a4a 100644
--- a/packages/python/python-pyreverse_0.5.0.bb
+++ b/packages/python/python-pyreverse_0.5.2.bb
@@ -2,13 +2,15 @@ DESCRIPTION = "PyReverse is a set of tools for reverse engineering Python code.
 tools, documentation generation, and XMI generation for importation in a UML modeling tool. A special module can be  \
 used to generate files readable by Argo UML."
 SECTION = "devel/python"
+HOMEPAGE = "http://www.logilab.org/2560"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "python-core python-logilab python-pyxml"
+RDEPENDS = "python-core python-logilab-common python-pyxml"
 SRCNAME = "pyreverse"
+PR = "ml0"
 
-SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
+           file://fix-future.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
-
diff --git a/packages/python/python-pyro_3.5.bb b/packages/python/python-pyro_3.7.bb
index dd6e60d430..80875af5c5 100644
--- a/packages/python/python-pyro_3.5.bb
+++ b/packages/python/python-pyro_3.7.bb
@@ -6,12 +6,11 @@ HOMEPAGE = "http://pyro.sourceforge.net"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
-RDEPENDS = "python-core python-crypt python-io python-lang python-math \
-python-netserver python-pickle python-re python-shell python-stringold \
-python-threading"
-PR = "r1"
+RDEPENDS = "python-crypt python-io python-lang python-math python-netserver python-pickle \
+python-re python-shell python-stringold python-threading"
+PR = "ml0"
 
-SRC_URI = "cvs://anonymous:@pyro.cvs.sourceforge.net/cvsroot/pyro;module=Pyro;method=pserver;tag=pyro3_5 \
+SRC_URI = "cvs://anonymous:@pyro.cvs.sourceforge.net/cvsroot/pyro;module=Pyro;method=pserver;tag=pyro3_7 \
            file://pyro-unattended-install.patch;patch=1;pnum=0"
 S="${WORKDIR}/Pyro"
 
diff --git a/packages/python/python-pyserial_2.0.bb b/packages/python/python-pyserial_2.0.bb
deleted file mode 100644
index d7adbe947c..0000000000
--- a/packages/python/python-pyserial_2.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Serial Port Support for Python"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "PSF"
-SRCNAME = "pyserial"
-RDEPENDS = "python-fcntl python-io"
-
-PR = "r1"
-
-SRC_URI = "http://www.vanille.de/mirror/${SRCNAME}-${PV}.tar.bz2"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
diff --git a/packages/python/python-pysqlite/no-host-includes.patch b/packages/python/python-pysqlite/no-host-includes.patch
deleted file mode 100644
index 20f5c98402..0000000000
--- a/packages/python/python-pysqlite/no-host-includes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- pysqlite/setup.py~no-host-includes
-+++ pysqlite/setup.py
-@@ -11,8 +11,8 @@
- macros = []
- 
- if sys.platform in ("linux-i386", "linux2"): # most Linux
--    include_dirs = ['/usr/include/sqlite']
--    library_dirs = ['/usr/lib/']
-+    include_dirs = []
-+    library_dirs = []
-     libraries = [sqlite]
-     runtime_library_dirs = []
-     extra_objects = []
-@@ -21,8 +21,8 @@
-         LOCALBASE = os.environ.get("LOCALBASE", "/opt/local")
-     else:
-         LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
--    include_dirs = ['%s/include' % LOCALBASE]
--    library_dirs = ['%s/lib/' % LOCALBASE]
-+    include_dirs = []
-+    library_dirs = []
-     libraries = [sqlite]
-     runtime_library_dirs = []
-     extra_objects = []
-@@ -33,8 +33,8 @@
-     runtime_library_dirs = []
-     extra_objects = []
- elif os.name == "posix": # most Unixish platforms
--    include_dirs = ['/usr/local/include']
--    library_dirs = ['/usr/local/lib']
-+    include_dirs = []
-+    library_dirs = []
-     libraries = [sqlite]
-     # On some platorms, this can be used to find the shared libraries
-     # at runtime, if they are in a non-standard location. Doesn't
diff --git a/packages/python/python-pysqlite2_2.2.2.bb b/packages/python/python-pysqlite2_2.2.2.bb
deleted file mode 100644
index 89d4030f5c..0000000000
--- a/packages/python/python-pysqlite2_2.2.2.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "A Python extension for the SQLite Embedded Relational Database"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "PSF"
-RDEPENDS = "python-core python-re python-lang python-datetime"
-DEPENDS = "sqlite3"
-SRCNAME = "pysqlite2"
-PR = "ml2"
-
-SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.2/${PV}/pysqlite-${PV}.tar.gz"
-S = "${WORKDIR}/pysqlite-${PV}"
-
-inherit distutils
-
-do_install_append() {
-    install -d ${D}${docdir}/doc
-    mv ${D}/${datadir}/pysqlite2-doc ${D}${docdir}/${SRCNAME}
-}
diff --git a/packages/python/python-pysqlite_1.0.bb b/packages/python/python-pysqlite_1.0.bb
deleted file mode 100644
index 1c567ab6e4..0000000000
--- a/packages/python/python-pysqlite_1.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "A Python extension for the SQLite Embedded Relational Database"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "PSF"
-RDEPENDS = "python-core python-re python-lang"
-DEPENDS = "sqlite"
-SRCNAME = "pysqlite"
-PR = "ml0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-           file://no-host-includes.patch;patch=1"
-S = "${WORKDIR}/${SRCNAME}"
-
-inherit distutils
diff --git a/packages/python/python-pytest_0.5.0.bb b/packages/python/python-pytest_0.6.0.bb
index 72826593e4..17db94897c 100644
--- a/packages/python/python-pytest_0.5.0.bb
+++ b/packages/python/python-pytest_0.6.0.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "This is a small package that facilitates the unit testing process
 by aggregating PyUnit tests and making them easier to call from the command \
 line and from within other unit tests."
 SECTION = "devel/python"
+HOMEPAGE = "http://oss.wxnet.org/pytester/index.html"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "pytest"
diff --git a/packages/python/python-pyvisa_0.9.7.bb b/packages/python/python-pyvisa_1.1.bb
index 5657c795a3..1bb185829e 100644
--- a/packages/python/python-pyvisa_0.9.7.bb
+++ b/packages/python/python-pyvisa_1.1.bb
@@ -1,9 +1,11 @@
 DESCRIPTION = "A Python package with bindings to the 'Virtual Instrument Software Architecture' \
 (VISA) library, in order to control measurement devices and test equipment via GPIB, RS232, or USB."
 SECTION = "devel/python"
+HOMEPAGE = "http://pyvisa.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "BSD"
 SRCNAME = "PyVISA"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pyvisa/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pyweather_0.5.0.bb b/packages/python/python-pyweather_0.7.0.bb
index 4a51d6eb9b..5c643fa5c0 100644
--- a/packages/python/python-pyweather_0.5.0.bb
+++ b/packages/python/python-pyweather_0.7.0.bb
@@ -3,10 +3,10 @@ that are capable of performing conversion calculations for many common meteorolo
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
-SRCNAME = "pyweather"
+SRCNAME = "weather"
 PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/weather-${PV}"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb
index 2bfe7ebcae..34b5cbfd0c 100644
--- a/packages/python/python-pyxml_0.8.4.bb
+++ b/packages/python/python-pyxml_0.8.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A sophisticated XML Processing Package for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
-RDEPENDS = "python-core python-xml python-netclient"
+RDEPENDS = "python-xml python-netclient"
 SRCNAME = "pyxml"
 PR = "ml0"
 
diff --git a/packages/python/python-quicklauncher_0.0.1.bb b/packages/python/python-quicklauncher_0.0.1.bb
deleted file mode 100644
index 10ee54deb1..0000000000
--- a/packages/python/python-quicklauncher_0.0.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "A PyQt-optimized Python Quicklauncher for Qt/Embedded based Palmtop Environments"
-SECTION = "devel/python"
-PRIORITY = "optional"
-RDEPENDS = "python-pyqt"
-PR = "ml1"
-SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pyquicklauncher"
-S = "${WORKDIR}/pyquicklauncher"
-LICENSE = "GPL"
-inherit distutils
-
-do_compile() {
-	true
-}
-
-#
-# FIXME: Launch during postinstall
-#
-
-do_install() {
-	install -d ${D}${libdir}/${PYTHON_DIR}/
-	install -m 0755 quicklauncher.py ${D}${libdir}/${PYTHON_DIR}/
-	install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
-	install -m 0755 testapp.py ${D}${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
-}
-
-
diff --git a/packages/python/python-scapy_0.9.17.bb b/packages/python/python-scapy_1.1.1.bb
index f9cc0eb6a1..be97582e2d 100644
--- a/packages/python/python-scapy_0.9.17.bb
+++ b/packages/python/python-scapy_1.1.1.bb
@@ -1,11 +1,12 @@
-LICENSE = "GPL"
 DESCRIPTION = "Scapy is a powerful interactive packet manipulation tool, \
 packet generator, network scanner, network discovery, packet sniffer, etc. \
 It can for the moment replace hping, 85% of nmap, arpspoof, arp-sk, arping, \
 tcpdump, tethereal, p0f, ...."
 SECTION = "devel/python"
+HOMEPAGE = "http://www.secdev.org/projects/scapy/"
+LICENSE = "GPL"
 PRIORITY = "optional"
-RDEPENDS = "python-core python-netclient python-netserver"
+RDEPENDS = "python-netclient python-netserver"
 SRCNAME = "scapy"
 
 SRC_URI = "http://www.secdev.org/projects/scapy/files/scapy-${PV}.tar.gz"
@@ -17,4 +18,3 @@ do_install() {
 }
 
 FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
-
diff --git a/packages/python/python-scons-native_0.96.90.bb b/packages/python/python-scons-native_0.97.bb
index 31bce5583d..31bce5583d 100644
--- a/packages/python/python-scons-native_0.96.90.bb
+++ b/packages/python/python-scons-native_0.97.bb
diff --git a/packages/python/python-scons_0.96.90.bb b/packages/python/python-scons_0.97.bb
index dc5b40243e..dc5b40243e 100644
--- a/packages/python/python-scons_0.96.90.bb
+++ b/packages/python/python-scons_0.97.bb
diff --git a/packages/python/python-sip4_4.4.5.bb b/packages/python/python-sip_4.7.bb
index 000aa8b86f..2978edd54f 100644
--- a/packages/python/python-sip4_4.4.5.bb
+++ b/packages/python/python-sip_4.7.bb
@@ -1,3 +1,5 @@
+BROKEN = "1"
+
 DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
@@ -7,10 +9,10 @@ DEPENDS = "python"
 RDEPENDS = "python-core"
 PR = "ml0"
 
-SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
+SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
 S = "${WORKDIR}/sip-${PV}/siplib"
 
-inherit qmake distutils-base
+inherit qmake qt4x11 distutils-base
 
 EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
                          CONFIG=console \
diff --git a/packages/python/python-soappy-0.11.3/.mtn2git_empty b/packages/python/python-soappy-0.11.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/python/python-soappy-0.11.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/python/python-pyqt4/.mtn2git_empty b/packages/python/python-soappy/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pyqt4/.mtn2git_empty
+++ b/packages/python/python-soappy/.mtn2git_empty
diff --git a/packages/python/python-soappy/fix-future.patch b/packages/python/python-soappy/fix-future.patch
new file mode 100644
index 0000000000..6c14e32c16
--- /dev/null
+++ b/packages/python/python-soappy/fix-future.patch
@@ -0,0 +1,54 @@
+Index: SOAPpy-0.11.6/SOAPpy/Client.py
+===================================================================
+--- SOAPpy-0.11.6.orig/SOAPpy/Client.py
++++ SOAPpy-0.11.6/SOAPpy/Client.py
+@@ -39,12 +39,11 @@
+ #
+ ################################################################################
+ """
++from __future__ import nested_scopes
+ 
+ ident = '$Id: Client.py,v 1.20 2004/04/10 04:22:52 irjudson Exp $'
+ from version import __version__
+ 
+-from __future__ import nested_scopes
+-
+ #import xml.sax
+ import urllib
+ from types import *
+Index: SOAPpy-0.11.6/SOAPpy/Types.py
+===================================================================
+--- SOAPpy-0.11.6.orig/SOAPpy/Types.py
++++ SOAPpy-0.11.6/SOAPpy/Types.py
+@@ -32,12 +32,11 @@
+ #
+ ################################################################################
+ """
++from __future__ import nested_scopes
+ 
+ ident = '$Id: Types.py,v 1.17 2004/09/11 03:03:33 warnes Exp $'
+ from version import __version__
+ 
+-from __future__ import nested_scopes
+-
+ import UserList
+ import base64
+ import cgi
+Index: SOAPpy-0.11.6/SOAPpy/Server.py
+===================================================================
+--- SOAPpy-0.11.6.orig/SOAPpy/Server.py
++++ SOAPpy-0.11.6/SOAPpy/Server.py
+@@ -39,12 +39,11 @@
+ #
+ ################################################################################
+ """
++from __future__ import nested_scopes
+ 
+ ident = '$Id: Server.py,v 1.20 2004/04/28 21:47:10 warnes Exp $'
+ from version import __version__
+ 
+-from __future__ import nested_scopes
+-
+ #import xml.sax
+ import re
+ import socket
diff --git a/packages/python/python-soappy-0.11.3/fpconst.py b/packages/python/python-soappy/fpconst.py
index a1f8f47e3a..a1f8f47e3a 100644
--- a/packages/python/python-soappy-0.11.3/fpconst.py
+++ b/packages/python/python-soappy/fpconst.py
diff --git a/packages/python/python-soappy_0.11.3.bb b/packages/python/python-soappy_0.11.6.bb
index 6ae59ac515..2f156acc06 100644
--- a/packages/python/python-soappy_0.11.3.bb
+++ b/packages/python/python-soappy_0.11.6.bb
@@ -1,18 +1,18 @@
 DESCRIPTION = "Python SOAP Bindings"
 SECTION = "devel/python"
+HOMEPAGE = "http://pywebsvcs.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "BSD"
-RDEPENDS = "python-core python-xml python-fpconst"
+RDEPENDS = "python-xml python-fpconst"
 SRCNAME = "SOAPpy"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pywebsvcs/${SRCNAME}-${PV}.tar.gz \
+           file://fix-future.patch;patch=1 \
            file://fpconst.py"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-# *cough*, yes this is a bit hackish.. but for now ;)
-
 do_compile_prepend() {
 	install -m 0644 ${WORKDIR}/fpconst.py ${S}/SOAPpy/fpconst.py
 }
diff --git a/packages/python/python-spydi_0.9.3.bb b/packages/python/python-spydi_0.9.7.bb
index 17283a981e..17283a981e 100644
--- a/packages/python/python-spydi_0.9.3.bb
+++ b/packages/python/python-spydi_0.9.7.bb
diff --git a/packages/python/python-spyro_0.9.14.bb b/packages/python/python-spyro_0.9.22.bb
index 9d5a583147..9d5a583147 100644
--- a/packages/python/python-spyro_0.9.14.bb
+++ b/packages/python/python-spyro_0.9.22.bb
diff --git a/packages/python/python-sqlobject_0.7.0.bb b/packages/python/python-sqlobject_0.9.1.bb
index e4a685f6c6..db8dfd4aff 100644
--- a/packages/python/python-sqlobject_0.7.0.bb
+++ b/packages/python/python-sqlobject_0.9.1.bb
@@ -2,10 +2,12 @@ DESCRIPTION = "SQLObject is an object-relational mapper. It allows you to transl
 table rows into Python objects, and manipulate those objects to transparently \
 manipulate the database."
 SECTION = "devel/python"
+HOMEPAGE = "http://www.sqlobject.org/"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 RDEPENDS = "python-formencode"
 SRCNAME = "SQLObject"
+PR = "ml0"
 
 SRC_URI = "http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-sword_1.5.9.bb b/packages/python/python-sword_1.5.9.bb
index 6c777bb54d..a18cf89466 100644
--- a/packages/python/python-sword_1.5.9.bb
+++ b/packages/python/python-sword_1.5.9.bb
@@ -17,9 +17,10 @@ inherit distutils autotools
 
 PARALLEL_MAKE = ""
 
-#do_configure_prepend() {
-#	./autogen.sh
-#}
+do_configure_prepend() {
+	touch ltmain.sh
+	./autogen.sh
+}
 
 do_compile() {
         oe_runmake BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} pythonswig python_make
diff --git a/packages/python/python-tlslite_0.3.0.bb b/packages/python/python-tlslite_0.3.8.bb
index f860b4b1b4..d21d5cda38 100644
--- a/packages/python/python-tlslite_0.3.0.bb
+++ b/packages/python/python-tlslite_0.3.8.bb
@@ -2,9 +2,11 @@ DESCRIPTION = "TLS Lite is a free python library that implements SSL 3.0 and TLS
 authentication methods such as SRP, shared keys, and cryptoIDs, in addition to X.509 certificates. TLS Lite is pure  \
 Python, however it can access OpenSSL or cryptlib for faster crypto operations."
 SECTION = "devel/python"
+HOMEPAGE = "http://trevp.net/tlslite/"
 PRIORITY = "optional"
 LICENSE = "PD"
 SRCNAME = "tlslite"
+PR = "ml0"
 
 SRC_URI = "http://trevp.net/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-urwid_0.8.4.bb b/packages/python/python-urwid_0.9.8.1.bb
index ca068ecf49..75c3c84701 100644
--- a/packages/python/python-urwid_0.8.4.bb
+++ b/packages/python/python-urwid_0.9.8.1.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "A Python Widget library based on python-curses."
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-RDEPENDS = "python-core python-curses"
+RDEPENDS = "python-curses"
 SRCNAME = "urwid"
+PR = "ml0"
 
 SRC_URI = "http://excess.org/urwid/urwid-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-webpy_0.138.bb b/packages/python/python-webpy_0.138.bb
deleted file mode 100644
index a6a36faedc..0000000000
--- a/packages/python/python-webpy_0.138.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "A Lightweight Web Application Framework"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "PSF"
-RDEPENDS = "python-netserver python-netclient python-pprint"
-
-PR = "ml1"
-
-SRC_URI = "file://web.py"
-S = "${WORKDIR}"
-
-inherit distutils-base
-
-do_install() {
-	install -d ${D}${libdir}/${PYTHON_DIR}
-	install -m 0755 web.py ${D}${libdir}/${PYTHON_DIR}
-}
-
diff --git a/packages/python/python-webpy_0.21.bb b/packages/python/python-webpy_0.21.bb
new file mode 100644
index 0000000000..f6bb1812d0
--- /dev/null
+++ b/packages/python/python-webpy_0.21.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "A Lightweight Web Application Framework"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "PSF"
+RDEPENDS = "python-netserver python-netclient python-pprint"
+PR = "ml0"
+
+SRC_URI = "http://webpy.org/static/web.py-${PV}.tar.gz"
+S = "${WORKDIR}/webpy"
+
+inherit distutils
diff --git a/packages/python/python-pyqwt-3.10/.mtn2git_empty b/packages/python/python24-pyqt2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pyqwt-3.10/.mtn2git_empty
+++ b/packages/python/python24-pyqt2/.mtn2git_empty
diff --git a/packages/python/python-pyqt-3.13/features b/packages/python/python24-pyqt2/features
index 6fe74cafe4..6fe74cafe4 100644
--- a/packages/python/python-pyqt-3.13/features
+++ b/packages/python/python24-pyqt2/features
diff --git a/packages/python/python-pyqt-3.13/qt2-fix.patch b/packages/python/python24-pyqt2/qt2-fix.patch
index 5ee978e8f6..5ee978e8f6 100644
--- a/packages/python/python-pyqt-3.13/qt2-fix.patch
+++ b/packages/python/python24-pyqt2/qt2-fix.patch
diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python24-pyqt2_3.13.bb
index f9a8bb334d..2c9916b366 100644
--- a/packages/python/python-pyqt_3.13.bb
+++ b/packages/python/python24-pyqt2_3.13.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqte2 virtual/libqpe1"
-RDEPENDS = "python-core python-sip"
+RDEPENDS = "python-core python24-sip"
 SRCNAME = "pyqt"
 PR = "ml5"
 
diff --git a/packages/python/python-pysqlite/.mtn2git_empty b/packages/python/python24-pyqwt2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pysqlite/.mtn2git_empty
+++ b/packages/python/python24-pyqwt2/.mtn2git_empty
diff --git a/packages/python/python-pyqwt-3.10/features b/packages/python/python24-pyqwt2/features
index 56eab20b69..56eab20b69 100644
--- a/packages/python/python-pyqwt-3.10/features
+++ b/packages/python/python24-pyqwt2/features
diff --git a/packages/python/python-pyqwt-3.10/qt2.x-compat.patch b/packages/python/python24-pyqwt2/qt2.x-compat.patch
index 249ff4a5ee..249ff4a5ee 100644
--- a/packages/python/python-pyqwt-3.10/qt2.x-compat.patch
+++ b/packages/python/python24-pyqwt2/qt2.x-compat.patch
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb
index d78bba7e8a..d78bba7e8a 100644
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python24-pyqwt2_3.10.bb
diff --git a/packages/python/python-sip_4.1.1.bb b/packages/python/python24-sip_4.1.1.bb
index 8e118ea7de..718b019af9 100644
--- a/packages/python/python-sip_4.1.1.bb
+++ b/packages/python/python24-sip_4.1.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "virtual/libqte2 python"
+DEPENDS = "virtual/libqte2 python24"
 RDEPENDS = "python-core"
 PR = "ml4"
 
diff --git a/packages/swig/swig-native_1.3.29.bb b/packages/swig/swig-native_1.3.29.bb
deleted file mode 100644
index 8210bb9cfb..0000000000
--- a/packages/swig/swig-native_1.3.29.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require swig_${PV}.bb
-inherit native
-
-do_stage() {
-	oe_runmake install PREFIX=${STAGING_BINDIR}/..
-}
-
diff --git a/packages/swig/swig_1.3.29.bb b/packages/swig/swig_1.3.29.bb
deleted file mode 100644
index c8f595be07..0000000000
--- a/packages/swig/swig_1.3.29.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator"
-HOMEPAGE = "http://swig.sourceforge.net/"
-LICENSE = "BSD"
-SECTION = "devel"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/swig/swig-${PV}.tar.gz"
-S = "${WORKDIR}/swig-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig"
-
-do_configure() {
-	oe_runconf
-}
-
diff --git a/packages/sword/sword_1.5.7.bb b/packages/sword/sword_1.5.7.bb
deleted file mode 100644
index e20dadc23f..0000000000
--- a/packages/sword/sword_1.5.7.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "The SWORD Project is an open source, cross-platform \
-(Linux, Windows, Solaris, MacOSX etc.) API and library for \
-Bible software with a constantly growing list of front-ends \
-(GUI, textmode, web-based, etc.) and a library of over 200 text modules"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r5"
-
-SRC_URI = "http://www.crosswire.org/~dglassey/sword-1.5.7a.tar.gz"
-
-inherit autotools
-
-EXTRA_OECONF = "--without-clucene --without-curl"
-
-do_stage() {
-	oe_libinstall -so -C lib libsword ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/sword/
-	for f in include/*.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/sword/
-	done
-
-}
diff --git a/packages/sword/sword_1.5.8.bb b/packages/sword/sword_1.5.8.bb
deleted file mode 100644
index b16e1fb013..0000000000
--- a/packages/sword/sword_1.5.8.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "The SWORD Project is an open source, cross-platform \
-(Linux, Windows, Solaris, MacOSX etc.) API and library for \
-Bible software with a constantly growing list of front-ends \
-(GUI, textmode, web-based, etc.) and a library of over 200 text modules"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--without-clucene --without-curl"
-
-do_stage() {
-	oe_libinstall -so -C lib libsword ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/sword/
-	for f in include/*.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/sword/
-	done
-
-}
-
-FILES_${PN} = "${libdir}/libsword*so ${sysconfdir} ${bindir} ${datadir}"
diff --git a/packages/sword/sword_1.5.9.bb b/packages/sword/sword_1.5.9.bb
index 2c180ac7e3..303d7f9fcc 100644
--- a/packages/sword/sword_1.5.9.bb
+++ b/packages/sword/sword_1.5.9.bb
@@ -3,26 +3,18 @@ DESCRIPTION = "The SWORD Project is an open source, cross-platform \
 Bible software with a constantly growing list of front-ends \
 (GUI, textmode, web-based, etc.) and a library of over 200 text modules"
 SECTION = "libs"
+HOMEPAGE = "http://www.e-sword.net/"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz \
-	file://gcc-visibility.patch;patch=1"
+           file://gcc-visibility.patch;patch=1"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig lib_package
 
 EXTRA_OECONF = "--without-clucene --without-curl"
 
 do_stage() {
-	oe_libinstall -so -C lib libsword ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/sword/
-	for f in include/*.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/sword/
-	done
-
+	autotools_stage_all
 }
-
-FILES_${PN} = "${libdir}/libsword*so ${sysconfdir} ${bindir} ${datadir}"
diff --git a/packages/tasks/task-python-everything_20060425.bb b/packages/tasks/task-python-everything.bb
index 37e4b99b87..d39e9a4afd 100644
--- a/packages/tasks/task-python-everything_20060425.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,16 +1,16 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml14"
-
-BROKEN_BECAUSE_GCC4 = "\
-		python-egenix-mx-base"
+PR = "ml15"
 
 RDEPENDS = "\
 		python-ao 		\
 		python-pybluez		\
+		python-cairo		\
+		python-cheetah		\
 		python-constraint	\
 		python-crypto		\
+		python-dbus			\
 		python-dialog		\
 		python-evas			\
 		python-ecore		\
@@ -19,35 +19,41 @@ RDEPENDS = "\
 		python-pycurl		\
 		python-fam			\
 		python-fnorb		\
+		python-formencode	\
 		python-fpconst		\
-		python-gammu		\
+		python-fuse			\
 		python-gmpy		\
 		python-gnosis		\
+		python-gst		\
 		python-hmm		\
+		python-imaging		\
+		python-imdbpy		\
 		python-inotify		\
 		python-irclib		\
 		python-itools		\
-		python-logilab		\
+		python-logilab-common		\
 		python-libgmail		\
 		python-lxml		\
 		python-mad		\
-		python-native		\
+		python-numarray		\
 		python-numeric		\
 		python-ogg		\
 		python-pexpect		\
+		python-pybluez		\
 		python-pychecker	\
 		python-pycodes		\
 		python-pyephem		\
 		python-pyfits		\
 		python-pyflakes		\
 		python-pygame		\
+		python-pygobject	\
 		python-pygoogle		\
+		python-pygtk-1.2	\
 		python-pygtk		\
-		python-pygtk2		\
+		python-pyid3lib		\
+		python-pyiw		\
 		python-pylinda		\
 		python-pylint		\
-		python-pyqt		\
-		python-pyqwt		\
 		python-pyraf		\
 		python-pyreverse	\
 		python-pyrex		\
@@ -58,7 +64,6 @@ RDEPENDS = "\
 		python-pyweather	\
 		python-pyxml		\
 		python-pyxmlrpc		\
-		python-quicklauncher    \
 		python-scapy		\
 		python-scons		\
 		python-setuptools	\
@@ -69,9 +74,7 @@ RDEPENDS = "\
 		python-soappy		\
 		python-spydi		\
 		python-spyro		\
-		python-sword		\
-		python-pysqlite		\
-		python-pysqlite2	\
+		python-sqlobject	\
 		python-tlslite		\
 		python-urwid		\
 		python-vmaps		\
@@ -82,9 +85,17 @@ RDEPENDS = "\
 		twisted			\
 		zope"
 
+BROKEN_PACKAGES = "\
+		python-egenix-mx-base \
+		python-gammu \
+		python-m2crypto \
+		python-sword \
+		python-mysqldb \
+        python-pyqt     \
+        python-pyqwt        \
+"
 
 #fixme add python-pycap once libdnet is in again
 #fixme add python-pyx once kpathwhich-native is there
 #fixme add packages dynamically
-#fixme python-numarray doesn't work with soft-float
 LICENSE = "MIT"