From 36bd4d761748b0f5d4b6bfe916dc183c9167672b Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 24 Jul 2007 02:22:33 +0000
Subject: python-setuptools, python-simplejson: catch up with changes in
 distutils build class

---
 packages/python/python-setuptools_0.6c5.bb | 26 --------------------------
 packages/python/python-setuptools_0.6c6.bb | 22 ++++++++++++++++++++++
 packages/python/python-simplejson_1.7.1.bb | 10 +---------
 3 files changed, 23 insertions(+), 35 deletions(-)
 delete mode 100644 packages/python/python-setuptools_0.6c5.bb
 create mode 100644 packages/python/python-setuptools_0.6c6.bb

(limited to 'packages')

diff --git a/packages/python/python-setuptools_0.6c5.bb b/packages/python/python-setuptools_0.6c5.bb
deleted file mode 100644
index 0ee3a02229..0000000000
--- a/packages/python/python-setuptools_0.6c5.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages"
-HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "MIT-like"
-RDEPENDS = "python-core python-zlib"
-SRCNAME = "setuptools"
-PR = "r0"
-
-SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-do_install_prepend() {
-    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
-}
-
-do_stage() {
-    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-      ${STAGING_BINDIR_NATIVE}/python setup.py install 
-}
-
-# Deal with .pth file error 
-export PYTHONPATH="${D}/${libdir}/${PYTHON_DIR}/site-packages"
-
diff --git a/packages/python/python-setuptools_0.6c6.bb b/packages/python/python-setuptools_0.6c6.bb
new file mode 100644
index 0000000000..ef56b9b652
--- /dev/null
+++ b/packages/python/python-setuptools_0.6c6.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages"
+HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT-like"
+RDEPENDS = "python-core python-zlib"
+SRCNAME = "setuptools"
+PR = "ml1"
+
+SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_install_prepend() {
+    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
+}
+
+do_stage() {
+    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+      ${STAGING_BINDIR_NATIVE}/python setup.py install 
+}
diff --git a/packages/python/python-simplejson_1.7.1.bb b/packages/python/python-simplejson_1.7.1.bb
index e41d9085af..129f4fb9eb 100644
--- a/packages/python/python-simplejson_1.7.1.bb
+++ b/packages/python/python-simplejson_1.7.1.bb
@@ -8,17 +8,9 @@ DEPENDS = "python-setuptools"
 # python-zlib is needed to unpack egg created by setuptools
 RDEPENDS = "python-core python-re python-io python-netserver python-zlib"
 SRCNAME = "simplejson"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://cheeseshop.python.org/packages/source/s/simplejson/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
-
-do_install_prepend() {
-    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
-}
-
-# Deal with .pth file error
-export PYTHONPATH="${D}/${libdir}/python2.4/site-packages"
-
-- 
cgit v1.2.3