11 files changed, 90 insertions, 38 deletions
diff --git a/packages/python/python-cython-native_0.9.6.14.bb b/packages/python/python-cython-native_0.9.6.14.bb
deleted file mode 100644
index cb7743e1bf..0000000000
--- a/packages/python/python-cython-native_0.9.6.14.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require python-cython_${PV}.bb
-inherit native
-DEPENDS = "python-native"
-RDEPENDS = ""
-
-do_stage() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
diff --git a/packages/python/python-cython-native_0.9.8.bb b/packages/python/python-cython-native_0.9.8.bb
index cb7743e1bf..a5c78cebe2 100644
--- a/packages/python/python-cython-native_0.9.8.bb
+++ b/packages/python/python-cython-native_0.9.8.bb
@@ -4,6 +4,7 @@ DEPENDS = "python-native"
 RDEPENDS = ""
 
 do_stage() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+    STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
         ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
 }
diff --git a/packages/python/python-cython_0.9.6.14.bb b/packages/python/python-cython_0.9.6.14.bb
deleted file mode 100644
index 6077089bf2..0000000000
--- a/packages/python/python-cython_0.9.6.14.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \
-It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \
-and the messy, low-level world of C."
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "GPL"
-SRCNAME = "Cython"
-PR = "ml0"
-
-SRC_URI = "http://pypi.python.org/packages/source/C/Cython/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
diff --git a/packages/python/python-cython_0.9.8.bb b/packages/python/python-cython_0.9.8.bb
index 9243aa61f0..69d73fe969 100644
--- a/packages/python/python-cython_0.9.8.bb
+++ b/packages/python/python-cython_0.9.8.bb
@@ -5,12 +5,10 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "Cython"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-DEFAULT_PREFERENCE = "-1"
-
diff --git a/packages/python/python-pyrex-native_0.9.8.4.bb b/packages/python/python-pyrex-native_0.9.8.4.bb
index d7ec81fd8e..4405212040 100644
--- a/packages/python/python-pyrex-native_0.9.8.4.bb
+++ b/packages/python/python-pyrex-native_0.9.8.4.bb
@@ -5,5 +5,6 @@ RDEPENDS = ""
 
 do_stage() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+	STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
         ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
 }
diff --git a/packages/python/python-pyrex_0.9.8.4.bb b/packages/python/python-pyrex_0.9.8.4.bb
index d0a5f826e0..80371c396a 100644
--- a/packages/python/python-pyrex_0.9.8.4.bb
+++ b/packages/python/python-pyrex_0.9.8.4.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "Pyrex"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://nz.cosc.canterbury.ac.nz/~greg/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
diff --git a/packages/python/python-pyyaml/.mtn2git_empty b/packages/python/python-pyyaml/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pyyaml/.mtn2git_empty
diff --git a/packages/python/python-pyyaml/setup.py b/packages/python/python-pyyaml/setup.py
new file mode 100644
index 0000000000..fb64983419
--- /dev/null
+++ b/packages/python/python-pyyaml/setup.py
@@ -0,0 +1,64 @@
+NAME = 'PyYAML'
+VERSION = '3.06'
+DESCRIPTION = "YAML parser and emitter for Python"
+LONG_DESCRIPTION = """\
+YAML is a data serialization format designed for human readability and
+interaction with scripting languages.  PyYAML is a YAML parser and
+emitter for Python.
+
+PyYAML features a complete YAML 1.1 parser, Unicode support, pickle
+support, capable extension API, and sensible error messages.  PyYAML
+supports standard YAML tags and provides Python-specific tags that allow
+to represent an arbitrary Python object.
+
+PyYAML is applicable for a broad range of tasks from complex
+configuration files to object serialization and persistance."""
+AUTHOR = "Kirill Simonov"
+AUTHOR_EMAIL = 'xi@resolvent.net'
+LICENSE = "MIT"
+PLATFORMS = "Any"
+URL = "http://pyyaml.org/wiki/PyYAML"
+DOWNLOAD_URL = "http://pyyaml.org/download/pyyaml/%s-%s.tar.gz" % (NAME, VERSION)
+CLASSIFIERS = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Text Processing :: Markup",
+]
+
+from distutils.core import setup
+from distutils.extension import Extension
+from Cython.Distutils import build_ext
+
+import sys, os.path
+
+
+if __name__ == '__main__':
+
+    setup(
+        name=NAME,
+        version=VERSION,
+        description=DESCRIPTION,
+        long_description=LONG_DESCRIPTION,
+        author=AUTHOR,
+        author_email=AUTHOR_EMAIL,
+        license=LICENSE,
+        platforms=PLATFORMS,
+        url=URL,
+        download_url=DOWNLOAD_URL,
+        classifiers=CLASSIFIERS,
+
+        package_dir={'': 'lib'},
+        packages=['yaml'],
+
+        ext_modules = [
+        Extension( "_yaml", ["ext/_yaml.pyx"], libraries = ["yaml"] )
+        ],
+
+        cmdclass={
+            'build_ext': build_ext,
+        },
+    )
diff --git a/packages/python/python-pyyaml_3.05.bb b/packages/python/python-pyyaml_3.05.bb
deleted file mode 100644
index 7f86bbadf7..0000000000
--- a/packages/python/python-pyyaml_3.05.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Python support for YAML"
-HOMEPAGE = "http://www.pyyaml.org"
-SECTION = "devel/python"
-LICENSE = "MIT"
-PR = "ml0"
-
-SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-3.05.tar.gz"
-S = "${WORKDIR}/PyYAML-${PV}"
-
-inherit distutils
diff --git a/packages/python/python-pyyaml_svn.bb b/packages/python/python-pyyaml_svn.bb
new file mode 100644
index 0000000000..3f316cff82
--- /dev/null
+++ b/packages/python/python-pyyaml_svn.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Python support for YAML"
+HOMEPAGE = "http://www.pyyaml.org"
+SECTION = "devel/python"
+LICENSE = "MIT"
+DEPENDS = "libyaml python-cython-native"
+PV = "3.05+svnr${SRCREV}"
+PR = "ml0"
+
+SRC_URI = "\
+  svn://svn.pyyaml.org/pyyaml;module=trunk;proto=http \
+  file://setup.py \
+"
+S = "${WORKDIR}/trunk"
+
+inherit distutils
+
+do_configure_prepend() {
+	# upstream setup.py overcomplicated, use ours
+	install -m 0644 ${WORKDIR}/setup.py ${S}
+}
diff --git a/packages/python/python-setuptools_0.6c8.bb b/packages/python/python-setuptools_0.6c8.bb
index 5b82ecea69..5409c8a7bc 100644
--- a/packages/python/python-setuptools_0.6c8.bb
+++ b/packages/python/python-setuptools_0.6c8.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "MIT-like"
 RDEPENDS = "python-distutils python-compression"
 SRCNAME = "setuptools"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "\
   http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\