merge of 'ae5744fa10248e83339259dfc0764f954c5b3456'

     and 'd2ff855675080c5ae36403d11904698712868163'

73 files changed, 204 insertions, 305 deletions

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-egenix-mx-base_2.0.6.bb b/packages/python/python-egenix-mx-base_2.0.6.bb
deleted file mode 100644
index b31cd20cad..0000000000
--- a/packages/python/python-egenix-mx-base_2.0.6.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "The eGenix.com mx Extensions for Python are a collection of professional quality Python software \
-tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text \
-processing, date/time processing and web site programming."
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "EGENIX"
-SRCNAME = "egenix-mx-base"
-PR = "r1"
-
-SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz \
-           file://gcc4.patch;patch=1"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-export INCLUDE = "${STAGING_INCDIR}/${PYTHON_DIR}"
-export LIB = "${STAGING_LIBDIR}"
-
-FILES_${PN} += "${datadir}"
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-m2crypto-0.13.1/0.13p1.patch b/packages/python/python-m2crypto-0.13.1/0.13p1.patch
deleted file mode 100644
index ad359185e6..0000000000
--- a/packages/python/python-m2crypto-0.13.1/0.13p1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- M2Crypto/SSL/Connection.py.org	Wed Mar 31 08:49:57 2004
-+++ M2Crypto/SSL/Connection.py	Wed Mar 31 08:50:45 2004
-@@ -143,11 +143,11 @@
-         """Set this connection's underlying socket to _mode_."""
-         self.socket.setblocking(mode)
-         if mode:
--            self.send = self.write = self._write_bio
--            self.recv = self.read = self._read_bio
-+            self.send = self.write = Connection._write_bio
-+            self.recv = self.read = Connection._read_bio
-         else:
--            self.send = self.write = self._write_nbio
--            self.recv = self.read = self._read_nbio
-+            self.send = self.write = Connection._write_nbio
-+            self.recv = self.read = Connection._read_nbio
- 
-     def fileno(self):
-         return self.socket.fileno()
---- M2Crypto/DSA.py.org	Wed Mar 31 08:53:16 2004
-+++ M2Crypto/DSA.py	Wed Mar 31 08:53:35 2004
-@@ -35,7 +35,7 @@
- 
-     def __getattr__(self, name):
-         if name in ['p', 'q', 'g', 'pub', 'priv']:
--            method = getattr(m2, 'm2.dsa_get_%s' % (name,))
-+            method = getattr(m2, 'dsa_get_%s' % (name,))
-             assert m2.dsa_type_check(self.dsa), "'dsa' type error"
-             return method(self.dsa)
-         else:
---- M2Crypto/_version.py.org	Wed Mar 31 12:25:21 2004
-+++ M2Crypto/_version.py	Wed Mar 31 12:24:18 2004
-@@ -1,8 +1,8 @@
- """M2Crypto Version Info"""
- 
--RCS_id='$Id: _version.py,v 1.2 2004/03/25 06:33:29 ngps Exp $'
-+RCS_id='$Id: _version.py,v 1.3 2004/03/31 01:30:58 ngps Exp $'
- 
- import string
--version_info = (0, 13)
-+version_info = (0, 13, 1)
- version = string.join(map(lambda x: "%s" % x, version_info), ".")
- 
diff --git a/packages/python/python-m2crypto_0.13.1.bb b/packages/python/python-m2crypto_0.13.1.bb
deleted file mode 100644
index 009345e5a0..0000000000
--- a/packages/python/python-m2crypto_0.13.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "A Python crypto and SSL toolkit"
-SECTION = "devel/python"
-PRIORITY = "optional"
-DEPENDS = "openssl swig-native"
-LICENSE = "BSD"
-SRCNAME = "M2Crypto"
-
-SRC_URI = "http://sandbox.rulemaker.net/ngps/Dist/m2crypto-0.13.zip \
-	   file://0.13p1.patch;patch=1;pnum=0"
-S = "${WORKDIR}/m2crypto-0.13"
-
-inherit distutils
-
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"