From 8c1d95f201599f6a9338adbf15df4e41c14118fc Mon Sep 17 00:00:00 2001
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Date: Wed, 16 Oct 2013 12:26:47 +0300
Subject: python-setuptools: upgrade to 1.1.6

The license line moved to another line.

(From OE-Core rev: 8712d24a6f3d687786eca770b7072bbc38ff88aa)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../python/python-setuptools_0.6c11.bb             | 41 ----------------------
 .../python/python-setuptools_1.1.6.bb              | 40 +++++++++++++++++++++
 2 files changed, 40 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-setuptools_0.6c11.bb
 create mode 100644 meta/recipes-devtools/python/python-setuptools_1.1.6.bb

diff --git a/meta/recipes-devtools/python/python-setuptools_0.6c11.bb b/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
deleted file mode 100644
index f09a312aec..0000000000
--- a/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages"
-HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
-SECTION = "devel/python"
-LICENSE = "PSF"
-LIC_FILES_CHKSUM = "file://setup.py;beginline=23;endline=23;md5=8a314270dd7a8dbca741775415f1716e"
-
-SRCNAME = "setuptools"
-PR = "ml5"
-DEPENDS += "python"
-DEPENDS_class-native += "python-native"
-
-SRC_URI = "\
-  http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
-"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages"
-
-do_install_prepend() {
-    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
-}
-
-RDEPENDS_${PN} = "\
-  python-stringold \
-  python-email \
-  python-shell \
-  python-distutils \
-  python-compression \
-"
-
-RDEPENDS_${PN}_class-native = "\
-  python-distutils \
-  python-compression \
-"
-
-SRC_URI[md5sum] = "7df2a529a074f613b509fb44feefe74e"
-SRC_URI[sha256sum] = "630fea9b726320b73ee3ca6ff61732cb32675b0389be658080fe46383b87a1d3"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/python/python-setuptools_1.1.6.bb b/meta/recipes-devtools/python/python-setuptools_1.1.6.bb
new file mode 100644
index 0000000000..ddaa303baa
--- /dev/null
+++ b/meta/recipes-devtools/python/python-setuptools_1.1.6.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages"
+HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
+SECTION = "devel/python"
+LICENSE = "PSF"
+LIC_FILES_CHKSUM = "file://setup.py;beginline=107;endline=107;md5=8a314270dd7a8dbca741775415f1716e"
+
+SRCNAME = "setuptools"
+DEPENDS += "python"
+DEPENDS_class-native += "python-native"
+
+SRC_URI = "\
+  http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
+"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages"
+
+do_install_prepend() {
+    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
+}
+
+RDEPENDS_${PN} = "\
+  python-stringold \
+  python-email \
+  python-shell \
+  python-distutils \
+  python-compression \
+"
+
+RDEPENDS_${PN}_class-native = "\
+  python-distutils \
+  python-compression \
+"
+
+SRC_URI[md5sum] = "ee82ea53def4480191061997409d2996"
+SRC_URI[sha256sum] = "e5a60b88138def225c29cbf13ee20f1c176f200450e286dcc7d192963a67723a"
+
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3-54-g00ecf