merge of '669bdfc0ca89598b9e5d56d8c2a7df2ad055c0b2'

     and '91d8f0c9c1e51e85470236a1a95ad046ba02f569'

19 files changed, 63 insertions, 61 deletions

diff --git a/packages/python/python-inotify_0.0.6.bb b/packages/python/python-inotify_0.0.6.bb
deleted file mode 100644
index 816f6e10a4..0000000000
--- a/packages/python/python-inotify_0.0.6.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "Python Linux Inotify Wrapper"
-SECTION = "devel/python"
-LICENSE = "GPL"
-
-SRC_URI = "http://www.vanille.de/mirror/python-inotify-${PV}.tar.gz"
-
-inherit distutils
-
diff --git a/packages/python/python-inotify_0.1.0.bb b/packages/python/python-inotify_0.1.0.bb
new file mode 100644
index 0000000000..941194abd6
--- /dev/null
+++ b/packages/python/python-inotify_0.1.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Python Linux Inotify Wrapper"
+SECTION = "devel/python"
+HOMEPAGE = "http://rudd-o.com/projects/python-inotify/"
+LICENSE = "GPL"
+PR = "ml0"
+
+SRC_URI = "http://rudd-o.com/wp-content/uploads/projects/files/python-inotify/python-inotify-${PV}.tar.gz"
+
+inherit distutils
+
diff --git a/packages/python/python-irclib_0.4.3.bb b/packages/python/python-irclib_0.4.3.bb
deleted file mode 100644
index fc1fa3c01f..0000000000
--- a/packages/python/python-irclib_0.4.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "IRC (Internet Relay Chat) Support Library"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-SRCNAME = "pyirclib"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
diff --git a/packages/python/python-irclib_0.4.6.bb b/packages/python/python-irclib_0.4.6.bb
new file mode 100644
index 0000000000..5e274c2c1e
--- /dev/null
+++ b/packages/python/python-irclib_0.4.6.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Python IRC (Internet Relay Chat) Support Library"
+SECTION = "devel/python"
+HOMEPAGE = "http://python-irclib.sourceforge.net/"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+PR = "ml0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/python-irclib/python-irclib-${PV}.tar.gz"
+
+inherit distutils
+
diff --git a/packages/python/python-itools_0.13.0.bb b/packages/python/python-itools_0.16.5.bb
index dbb36e8f4e..7879c6415e 100644
--- a/packages/python/python-itools_0.13.0.bb
+++ b/packages/python/python-itools_0.16.5.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "itools is a python web technologies library"
 SECTION = "devel/python"
+HOMEPAGE = "http://www.ikaaro.org/itools"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-RDEPENDS = "python-core"
 SRCNAME = "itools"
+PR = "ml0"
 
 SRC_URI = "http://download.ikaaro.org/itools/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-libgmail_0.0.7.bb b/packages/python/python-libgmail_0.0.7.bb
deleted file mode 100644
index 03963243c8..0000000000
--- a/packages/python/python-libgmail_0.0.7.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Python Bindings for Google's Gmail Service"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "GPL"
-RDEPENDS = "python-core python-netclient python-email"
-SRCNAME = "libgmail"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tgz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils-base
-
-do_install() {
-	install -d ${D}${libdir}/${PYTHON_DIR}
-	for file in *.py
-	do
-		install -m 0755 ${file} ${D}${libdir}/${PYTHON_DIR}
-	done
-}
diff --git a/packages/python/python-libgmail_0.1.3.3.bb b/packages/python/python-libgmail_0.1.6.bb
index c59240e9cd..aeb08113ea 100644
--- a/packages/python/python-libgmail_0.1.3.3.bb
+++ b/packages/python/python-libgmail_0.1.6.bb
@@ -1,9 +1,11 @@
 DESCRIPTION = "Python Bindings for Google's Gmail Service"
 SECTION = "devel/python"
+HOMEPAGE = "http://libgmail.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "python-core python-netclient python-email python-mime python-pprint python-re python-pickle"
 SRCNAME = "libgmail"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pycodes-1.1/.mtn2git_empty b/packages/python/python-logilab-common/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pycodes-1.1/.mtn2git_empty
+++ b/packages/python/python-logilab-common/.mtn2git_empty
diff --git a/packages/python/python-logilab-common/fix-future-in-setup.patch b/packages/python/python-logilab-common/fix-future-in-setup.patch
new file mode 100644
index 0000000000..1abde49bef
--- /dev/null
+++ b/packages/python/python-logilab-common/fix-future-in-setup.patch
@@ -0,0 +1,16 @@
+Index: common-0.9.3/setup.py
+===================================================================
+--- common-0.9.3.orig/setup.py
++++ common-0.9.3/setup.py
+@@ -17,9 +17,10 @@
+ # 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.23 2004/05/27 12:07:23 syt Exp $'
+ 
+-from __future__ import nested_scopes
+ import os
+ import sys
+ import shutil
diff --git a/packages/python/python-logilab_0.4.4.bb b/packages/python/python-logilab-common_0.9.3.bb
index dd2599c720..87c9a25f53 100644
--- a/packages/python/python-logilab_0.4.4.bb
+++ b/packages/python/python-logilab-common_0.9.3.bb
@@ -7,8 +7,10 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "common"
+PR = "ml0"
 
-SRC_URI = "ftp://ftp.logilab.fr/pub/common/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.logilab.fr/pub/common/${SRCNAME}-${PV}.tar.gz \
+           file://fix-future-in-setup.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/packages/python/python-lxml_1.0.2.bb b/packages/python/python-lxml_1.3.3.bb
index de0566e38f..de0566e38f 100644
--- a/packages/python/python-lxml_1.0.2.bb
+++ b/packages/python/python-lxml_1.3.3.bb
diff --git a/packages/python/python-mad_0.5.1.bb b/packages/python/python-mad_0.6.bb
index 20e3af770c..e62b8c88d6 100644
--- a/packages/python/python-mad_0.5.1.bb
+++ b/packages/python/python-mad_0.6.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Python libmad Bindings"
 SECTION = "devel/python"
+HOMEPAGE = "http://spacepants.org/src/pymad/"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-RDEPENDS = "python-core libmad"
 DEPENDS = "libmad"
 SRCNAME = "pymad"
+PR = "ml0"
 
 SRC_URI = "http://spacepants.org/src/pymad/download/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pychecker_0.8.14.bb b/packages/python/python-pychecker_0.8.17.bb
index 25ae7f0ae7..1b39b588ce 100644
--- a/packages/python/python-pychecker_0.8.14.bb
+++ b/packages/python/python-pychecker_0.8.17.bb
@@ -1,8 +1,10 @@
 DESCRIPTION = "SourceCode Test Utility"
 SECTION = "devel/python"
+HOMEPAGE = "http://pychecker.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "BSD"
 SRCNAME = "pychecker"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pycodes/.mtn2git_empty b/packages/python/python-pycodes/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pycodes/.mtn2git_empty
diff --git a/packages/python/python-pycodes-1.1/no-docs.patch b/packages/python/python-pycodes/no-docs.patch
index 5d41e8c03f..5d41e8c03f 100644
--- a/packages/python/python-pycodes-1.1/no-docs.patch
+++ b/packages/python/python-pycodes/no-docs.patch
diff --git a/packages/python/python-pycodes_1.1.bb b/packages/python/python-pycodes_1.1.bb
deleted file mode 100644
index f238dcd6af..0000000000
--- a/packages/python/python-pycodes_1.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "The pycodes package provides various extensions to Python for low density parity check (LDPC) codes \
-(an extremely powerful class of error correcting codes). LDPC codes can be used for physical layer error correction \
-in wireless, telephone, DSL, or cable modems; packet loss correction in multicast and distribution of bulk data over \
-the Internet; and even data compression. A variety of decoding/quantization algorithms are provided including standard\
-things like sum-product as well as linear programming relaxations."
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "PYCODES"
-SRCNAME = "pycodes"
-
-SRC_URI = "http://web.mit.edu/~emin/www/source_code/pycodes/pycodes-1-1.tar.gz \
-           file://no-docs.patch;patch=1"
-S = "${WORKDIR}/${SRCNAME}"
-
-inherit distutils
diff --git a/packages/python/python-pycodes_1.2.bb b/packages/python/python-pycodes_1.2.bb
new file mode 100644
index 0000000000..6cf94a6902
--- /dev/null
+++ b/packages/python/python-pycodes_1.2.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "The pycodes package provides various extensions to Python for low density parity check (LDPC) codes \
+(an extremely powerful class of error correcting codes)."
+SECTION = "devel/python"
+HOMEPAGE = "http://web.mit.edu/~emin/www/source_code/pycodes/index.html"
+PRIORITY = "optional"
+LICENSE = "PYCODES"
+SRCNAME = "pycodes"
+PR = "ml0"
+
+SRC_URI = "http://web.mit.edu/~emin/www/source_code/pycodes/pycodes-1-2.tar.gz \
+           file://no-docs.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
diff --git a/packages/python/python-pyephem_3.7b.bb b/packages/python/python-pyephem_3.7.2a.bb
index 5141b6e574..c5d3e111a8 100644
--- a/packages/python/python-pyephem_3.7b.bb
+++ b/packages/python/python-pyephem_3.7.2a.bb
@@ -1,8 +1,5 @@
 DESCRIPTION = "PyEphem provides scientific-grade astronomical computations \
-for the Python programming language. \
-Given a date and location on the Earth's surface, it can compute the positions \
-of the Sun and Moon, of the planets and their moons, and of any asteroids, \
-comets, or earth satellites whose orbital elements the user can provide."
+for the Python programming language."
 HOMEPAGE = "http://www.rhodesmill.org/brandon/projects/pyephem.html"
 LICENSE = "PSF"
 AUTHOR = "Brandon Craig Rhodes"
diff --git a/packages/python/python-vorbis_1.3.bb b/packages/python/python-vorbis_1.3.bb
index 7e839d1af4..dd4b115709 100644
--- a/packages/python/python-vorbis_1.3.bb
+++ b/packages/python/python-vorbis_1.3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Python Vorbis Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-RDEPENDS = "python-core libvorbis python-ogg"
 DEPENDS = "libvorbis python-ogg"
 SRCNAME = "pyvorbis"