11 files changed, 12 insertions, 63 deletions

diff --git a/meta/packages/python/python-dbus_0.83.0.bb b/meta/packages/python/python-dbus_0.83.0.bb
index 275e60e329..d35b2808fe 100644
--- a/meta/packages/python/python-dbus_0.83.0.bb
+++ b/meta/packages/python/python-dbus_0.83.0.bb
@@ -16,10 +16,6 @@ export HOST_SYS
 export STAGING_LIBDIR
 export STAGING_INCDIR
 
-do_stage() {
-        autotools_stage_all
-}
-
 RDEPENDS = "python-io python-logging python-stringold python-threading python-xml"
 
 FILES_${PN}-dev += "${libdir}/pkgconfig 
diff --git a/meta/packages/python/python-iniparse-native_0.2.3.bb b/meta/packages/python/python-iniparse-native_0.2.3.bb
index c2d633c5f2..bb841fed10 100644
--- a/meta/packages/python/python-iniparse-native_0.2.3.bb
+++ b/meta/packages/python/python-iniparse-native_0.2.3.bb
@@ -2,9 +2,5 @@ require python-iniparse_${PV}.bb
 inherit native
 DEPENDS = "python-native"
 RDEPENDS = ""
+NATIVE_INSTALL_WORKS = "1"
 
-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/meta/packages/python/python-pycairo_1.4.0.bb b/meta/packages/python/python-pycairo_1.4.0.bb
index 9bb2fdfcd8..8248775587 100644
--- a/meta/packages/python/python-pycairo_1.4.0.bb
+++ b/meta/packages/python/python-pycairo_1.4.0.bb
@@ -10,10 +10,3 @@ S = "${WORKDIR}/pycairo-${PV}"
 
 inherit distutils pkgconfig
 
-do_stage() {
-        install -d ${STAGING_INCDIR}
-        install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
-
-    # nasty pkgconfig fix necessary here
-    sed -i -e s,${STAGING_DIR_NATIVE},, pycairo.pc
-}
diff --git a/meta/packages/python/python-pygobject-native_2.16.0.bb b/meta/packages/python/python-pygobject-native_2.16.0.bb
index a1c733334c..f5b9cb338c 100644
--- a/meta/packages/python/python-pygobject-native_2.16.0.bb
+++ b/meta/packages/python/python-pygobject-native_2.16.0.bb
@@ -7,12 +7,14 @@ PARALLEL_MAKE = ""
 
 inherit native
 
+NATIVE_INSTALL_WORKS = "1"
+
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
 #  file://python-path.patch;patch=1 \
 "
 
-do_stage_append() {
-        install -d ${STAGING_BINDIR}
-        install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants
+do_install_append() {
+        install -d ${D}${bindir}
+        install -m 0755 gobject/generate-constants ${D}${bindir}/gobject-generate-constants
 }
diff --git a/meta/packages/python/python-pygobject_2.16.0.bb b/meta/packages/python/python-pygobject_2.16.0.bb
index 773ffdff49..de07ec762c 100644
--- a/meta/packages/python/python-pygobject_2.16.0.bb
+++ b/meta/packages/python/python-pygobject_2.16.0.bb
@@ -22,14 +22,6 @@ export HOST_SYS
 export STAGING_INCDIR
 export STAGING_LIBDIR
 
-do_stage() {
-        autotools_stage_all
-        install -d ${STAGING_LIBDIR}/../share/pygobject/
-        cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
-        install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
-        cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
-}
-
 PACKAGES += "${PN}-lib"
 
 RDEPENDS_${PN} += "python-textutils"
diff --git a/meta/packages/python/python-pygtk_2.10.4.bb b/meta/packages/python/python-pygtk_2.10.4.bb
index 6b26f59ad8..c37f64e51d 100644
--- a/meta/packages/python/python-pygtk_2.10.4.bb
+++ b/meta/packages/python/python-pygtk_2.10.4.bb
@@ -49,13 +49,3 @@ FILES_${PN}-dev += "\
   ${bindir}/pygtk-* \
   ${datadir}/pygtk/2.0"
 
-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/meta/packages/python/python-pyrex-native_0.9.8.5.bb b/meta/packages/python/python-pyrex-native_0.9.8.5.bb
index 4405212040..7912355449 100644
--- a/meta/packages/python/python-pyrex-native_0.9.8.5.bb
+++ b/meta/packages/python/python-pyrex-native_0.9.8.5.bb
@@ -3,8 +3,4 @@ inherit native
 DEPENDS = "python-native"
 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}
-}
+NATIVE_INSTALL_WORKS = "1"
diff --git a/meta/packages/python/python-pyrex_0.9.8.5.bb b/meta/packages/python/python-pyrex_0.9.8.5.bb
index 03468a0522..7523e11279 100644
--- a/meta/packages/python/python-pyrex_0.9.8.5.bb
+++ b/meta/packages/python/python-pyrex_0.9.8.5.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "Pyrex"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "\
   http://www.cosc.canterbury.ac.nz/greg.ewing/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
diff --git a/meta/packages/python/python-scons-native_0.97.bb b/meta/packages/python/python-scons-native_0.97.bb
index 45eeee117a..915cbabd90 100644
--- a/meta/packages/python/python-scons-native_0.97.bb
+++ b/meta/packages/python/python-scons-native_0.97.bb
@@ -3,14 +3,5 @@ inherit native
 DEPENDS = "python-native"
 RDEPENDS = ""
 
-do_stage() {
-        STAGING_LIBDIR=${STAGING_LIBDIR} \
-        STAGING_INCDIR=${STAGING_INCDIR} \
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_LIBDIR}/.. --install-data=${STAGING_DATADIR} || \
-        oefatal "python setup.py install execution failed."
-}
+NATIVE_INSTALL_WORKS = "1"
 
-do_install() {
-        :
-}
diff --git a/meta/packages/python/python-urlgrabber-native_3.1.0.bb b/meta/packages/python/python-urlgrabber-native_3.1.0.bb
index 5e43ca2d87..353fd65307 100644
--- a/meta/packages/python/python-urlgrabber-native_3.1.0.bb
+++ b/meta/packages/python/python-urlgrabber-native_3.1.0.bb
@@ -3,8 +3,5 @@ inherit native
 DEPENDS = "python-native"
 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}
-}
+NATIVE_INSTALL_WORKS = "1"
+
diff --git a/meta/packages/python/yum-metadata-parser-native_1.1.2.bb b/meta/packages/python/yum-metadata-parser-native_1.1.2.bb
index 8a43ec462d..3fff85afa3 100644
--- a/meta/packages/python/yum-metadata-parser-native_1.1.2.bb
+++ b/meta/packages/python/yum-metadata-parser-native_1.1.2.bb
@@ -5,8 +5,4 @@ RDEPENDS = ""
 
 #BUILD_CFLAGS += "-I${STAGING_LIBDIR}/glib-2.0"
 
-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}
-}
+NATIVE_INSTALL_WORKS = "1"