From 6a8d57c0b7e243a22730f637295d620d08b975e0 Mon Sep 17 00:00:00 2001
From: Derek Straka <derek@asterius.io>
Date: Wed, 30 Nov 2016 14:13:55 -0500
Subject: python-cryptography: update to version 1.6

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-devtools/python/python-cryptography.inc | 17 +++++++++++++----
 .../python/python-cryptography_1.4.bb               | 16 ----------------
 .../python/python-cryptography_1.6.bb               | 21 +++++++++++++++++++++
 .../python/python3-cryptography_1.4.bb              | 10 ----------
 .../python/python3-cryptography_1.6.bb              | 10 ++++++++++
 5 files changed, 44 insertions(+), 30 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-cryptography_1.4.bb
 create mode 100644 meta-python/recipes-devtools/python/python-cryptography_1.6.bb
 delete mode 100644 meta-python/recipes-devtools/python/python3-cryptography_1.4.bb
 create mode 100644 meta-python/recipes-devtools/python/python3-cryptography_1.6.bb

(limited to 'meta-python/recipes-devtools/python')

diff --git a/meta-python/recipes-devtools/python/python-cryptography.inc b/meta-python/recipes-devtools/python/python-cryptography.inc
index d4767b1d9..50483bdfd 100644
--- a/meta-python/recipes-devtools/python/python-cryptography.inc
+++ b/meta-python/recipes-devtools/python/python-cryptography.inc
@@ -1,6 +1,6 @@
 SUMMARY = "Provides cryptographic recipes and primitives to python developers"
 LICENSE = "Apache-2.0 | BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1f375ab4f6b9a7c9eec25377c52d3aa1"
 
 DEPENDS += " \
     ${PYTHON_PN}-cffi \
@@ -9,18 +9,27 @@ DEPENDS += " \
     ${PYTHON_PN}-six \
 "
 
-SRC_URI[md5sum] = "a9763e3831cc7cdb402c028fac1ceb39"
-SRC_URI[sha256sum] = "bb149540ed90c4b2171bf694fe6991d6331bc149ae623c8ff419324f4222d128"
+SRC_URI[md5sum] = "33ed393be75f04cd889a02a11acbab39"
+SRC_URI[sha256sum] = "4d0d86d2c8d3fc89133c3fa0d164a688a458b6663ab6fa965c80d6c2cdaf9b3f"
 
 RDEPENDS_${PN} += " \
     ${PYTHON_PN}-cffi \
     ${PYTHON_PN}-idna \
-    ${PYTHON_PN}-numbers \
     ${PYTHON_PN}-pyasn1 \
     ${PYTHON_PN}-pycparser \
     ${PYTHON_PN}-setuptools \
     ${PYTHON_PN}-six \
+"
+
+RDEPENDS_${PN}_class-target += " \
+    ${PYTHON_PN}-cffi \
+    ${PYTHON_PN}-idna \
+    ${PYTHON_PN}-numbers \
+    ${PYTHON_PN}-pyasn1 \
+    ${PYTHON_PN}-pycparser \
     ${PYTHON_PN}-subprocess \
+    ${PYTHON_PN}-setuptools \
+    ${PYTHON_PN}-six \
     ${PYTHON_PN}-threading \
 "
 
diff --git a/meta-python/recipes-devtools/python/python-cryptography_1.4.bb b/meta-python/recipes-devtools/python/python-cryptography_1.4.bb
deleted file mode 100644
index b05c61510..000000000
--- a/meta-python/recipes-devtools/python/python-cryptography_1.4.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-inherit pypi setuptools
-require python-cryptography.inc
-
-SRC_URI += " \
-    file://run-ptest \
-"
-
-DEPENDS += " \
-    ${PYTHON_PN}-enum34 \
-"
-
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-contextlib \
-    ${PYTHON_PN}-enum34 \
-    ${PYTHON_PN}-ipaddress \
-"
diff --git a/meta-python/recipes-devtools/python/python-cryptography_1.6.bb b/meta-python/recipes-devtools/python/python-cryptography_1.6.bb
new file mode 100644
index 000000000..f5b1e0b3b
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-cryptography_1.6.bb
@@ -0,0 +1,21 @@
+inherit pypi setuptools
+require python-cryptography.inc
+
+SRC_URI += " \
+    file://run-ptest \
+"
+
+DEPENDS += " \
+    ${PYTHON_PN}-enum34 \
+"
+
+RDEPENDS_${PN} += " \
+    ${PYTHON_PN}-enum34 \
+    ${PYTHON_PN}-ipaddress \
+"
+
+RDEPENDS_${PN}_class-target += " \
+    ${PYTHON_PN}-enum34 \
+    ${PYTHON_PN}-ipaddress \
+    ${PYTHON_PN}-contextlib \
+"
diff --git a/meta-python/recipes-devtools/python/python3-cryptography_1.4.bb b/meta-python/recipes-devtools/python/python3-cryptography_1.4.bb
deleted file mode 100644
index f807042ec..000000000
--- a/meta-python/recipes-devtools/python/python3-cryptography_1.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-inherit pypi setuptools3
-require python-cryptography.inc
-
-SRC_URI += " \
-    file://run-ptest \
-"
-
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-lang \
-"
diff --git a/meta-python/recipes-devtools/python/python3-cryptography_1.6.bb b/meta-python/recipes-devtools/python/python3-cryptography_1.6.bb
new file mode 100644
index 000000000..f807042ec
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-cryptography_1.6.bb
@@ -0,0 +1,10 @@
+inherit pypi setuptools3
+require python-cryptography.inc
+
+SRC_URI += " \
+    file://run-ptest \
+"
+
+RDEPENDS_${PN} += " \
+    ${PYTHON_PN}-lang \
+"
-- 
cgit v1.2.3-54-g00ecf