From 3782164546aca84011940811c411e09601fbe399 Mon Sep 17 00:00:00 2001
From: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Date: Wed, 8 Jun 2016 05:56:14 +0000
Subject: python-scons: Upgrade from 2.4.1 to 2.5.0

Upgrades both python-scons and python-scons-native to 2.5.0,
also fixes a runtime dependency issue when calling scons

Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../python/python-scons-native_2.4.1.bb            |  8 --------
 .../python/python-scons-native_2.5.0.bb            |  8 ++++++++
 meta/recipes-devtools/python/python-scons_2.4.1.bb | 22 --------------------
 meta/recipes-devtools/python/python-scons_2.5.0.bb | 24 ++++++++++++++++++++++
 4 files changed, 32 insertions(+), 30 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-scons-native_2.4.1.bb
 create mode 100644 meta/recipes-devtools/python/python-scons-native_2.5.0.bb
 delete mode 100644 meta/recipes-devtools/python/python-scons_2.4.1.bb
 create mode 100644 meta/recipes-devtools/python/python-scons_2.5.0.bb

diff --git a/meta/recipes-devtools/python/python-scons-native_2.4.1.bb b/meta/recipes-devtools/python/python-scons-native_2.4.1.bb
deleted file mode 100644
index dae89ab5d2..0000000000
--- a/meta/recipes-devtools/python/python-scons-native_2.4.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require python-scons_${PV}.bb
-inherit native pythonnative
-DEPENDS = "python-native"
-RDEPENDS_${PN} = ""
-
-do_install_append() {
-    create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}'
-}
diff --git a/meta/recipes-devtools/python/python-scons-native_2.5.0.bb b/meta/recipes-devtools/python/python-scons-native_2.5.0.bb
new file mode 100644
index 0000000000..dae89ab5d2
--- /dev/null
+++ b/meta/recipes-devtools/python/python-scons-native_2.5.0.bb
@@ -0,0 +1,8 @@
+require python-scons_${PV}.bb
+inherit native pythonnative
+DEPENDS = "python-native"
+RDEPENDS_${PN} = ""
+
+do_install_append() {
+    create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}'
+}
diff --git a/meta/recipes-devtools/python/python-scons_2.4.1.bb b/meta/recipes-devtools/python/python-scons_2.4.1.bb
deleted file mode 100644
index 096cf5c960..0000000000
--- a/meta/recipes-devtools/python/python-scons_2.4.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Software Construction tool (make/autotools replacement)"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=23bc1530c55e9f0d1b709056bcea237d"
-SRCNAME = "scons"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "9a0ddf33d9839f04380e0fae87cc4b40"
-SRC_URI[sha256sum] = "8fc4f42928c69bcbb33e1be94b646f2c700b659693fabc778c192d4d22f753a7"
-
-UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/scons/files/scons/"
-UPSTREAM_CHECK_REGEX = "/scons/(?P<pver>(\d+[\.\-_]*)+)/"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-RDEPENDS_${PN} = "\
-  python-fcntl \
-  python-io \
-  "
diff --git a/meta/recipes-devtools/python/python-scons_2.5.0.bb b/meta/recipes-devtools/python/python-scons_2.5.0.bb
new file mode 100644
index 0000000000..c0a1cd4948
--- /dev/null
+++ b/meta/recipes-devtools/python/python-scons_2.5.0.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Software Construction tool (make/autotools replacement)"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3a885dff6d14e4cd876d9008a09a42de"
+SRCNAME = "scons"
+
+SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "bda5530a70a41a7831d83c8b191c021e"
+SRC_URI[sha256sum] = "01f1b3d6023516a8e1b5e77799e5a82a23b32953b1102d339059ffeca8600493"
+
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/SCons/"
+UPSTREAM_CHECK_REGEX = "/scons/(?P<pver>(\d+[\.\-_]*)+)/"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+RDEPENDS_${PN} = "\
+  python-fcntl \
+  python-io \
+  python-json \
+  python-subprocess \
+  "
-- 
cgit 1.2.3-korg