From 3764856504d882fc1ea851fc6108ddcbbb6cf356 Mon Sep 17 00:00:00 2001
From: Derek Straka <derek@asterius.io>
Date: Sun, 21 Jan 2018 11:20:29 -0500
Subject: Remove deprecated python3-re from the RDEPENDS

The python3-re package was removed as part of the migration to the
json manifest file.  The functionality is now part of core

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-python/recipes-devtools/python/python-astroid.inc          | 1 -
 meta-python/recipes-devtools/python/python-astroid_1.6.0.bb     | 1 +
 meta-python/recipes-devtools/python/python-gevent.inc           | 1 -
 meta-python/recipes-devtools/python/python-gevent_1.2.2.bb      | 1 +
 meta-python/recipes-devtools/python/python-jinja2.inc           | 2 +-
 meta-python/recipes-devtools/python/python-jinja2_2.10.bb       | 2 ++
 meta-python/recipes-devtools/python/python-jsonpatch.inc        | 2 +-
 meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb    | 2 ++
 meta-python/recipes-devtools/python/python-jsonpointer.inc      | 1 -
 meta-python/recipes-devtools/python/python-jsonpointer_1.14.bb  | 2 ++
 meta-python/recipes-devtools/python/python-jsonschema.inc       | 1 -
 meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb  | 1 +
 meta-python/recipes-devtools/python/python-markupsafe.inc       | 2 +-
 meta-python/recipes-devtools/python/python-markupsafe_1.0.bb    | 2 ++
 meta-python/recipes-devtools/python/python-simplejson.inc       | 1 -
 meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb | 2 ++
 16 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-astroid.inc b/meta-python/recipes-devtools/python/python-astroid.inc
index 971aaf47d9..a71762c50d 100644
--- a/meta-python/recipes-devtools/python/python-astroid.inc
+++ b/meta-python/recipes-devtools/python/python-astroid.inc
@@ -22,7 +22,6 @@ RDEPENDS_${PN}_class-target += "\
     ${PYTHON_PN}-six \
     ${PYTHON_PN}-subprocess \
     ${PYTHON_PN}-wrapt \
-    ${PYTHON_PN}-re \
     ${PYTHON_PN}-setuptools \
 "
 
diff --git a/meta-python/recipes-devtools/python/python-astroid_1.6.0.bb b/meta-python/recipes-devtools/python/python-astroid_1.6.0.bb
index 3ced19a09d..42208bcb10 100644
--- a/meta-python/recipes-devtools/python/python-astroid_1.6.0.bb
+++ b/meta-python/recipes-devtools/python/python-astroid_1.6.0.bb
@@ -5,5 +5,6 @@ RDEPENDS_${PN}_class-target += " \
     ${PYTHON_PN}-enum34 \
     ${PYTHON_PN}-backports-functools-lru-cache \
     ${PYTHON_PN}-importlib \
+    ${PYTHON_PN}-re \
     ${PYTHON_PN}-singledispatch \
 "
diff --git a/meta-python/recipes-devtools/python/python-gevent.inc b/meta-python/recipes-devtools/python/python-gevent.inc
index 8889cfb5a7..13513f2192 100644
--- a/meta-python/recipes-devtools/python/python-gevent.inc
+++ b/meta-python/recipes-devtools/python/python-gevent.inc
@@ -11,7 +11,6 @@ DEPENDS += "${PYTHON_PN}-greenlet"
 RDEPENDS_${PN} = "${PYTHON_PN}-greenlet \
 		  ${PYTHON_PN}-mime \
 		  ${PYTHON_PN}-pprint \
-		  ${PYTHON_PN}-re \
 		 "
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/python-gevent:"
diff --git a/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb b/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb
index f357c95273..f13bfd7b73 100644
--- a/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb
+++ b/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb
@@ -1,3 +1,4 @@
 require python-gevent.inc
 inherit setuptools
 
+RDEPENDS_${PN} += "${PYTHON_PN}-re"
diff --git a/meta-python/recipes-devtools/python/python-jinja2.inc b/meta-python/recipes-devtools/python/python-jinja2.inc
index cd50d931ba..72562fb53b 100644
--- a/meta-python/recipes-devtools/python/python-jinja2.inc
+++ b/meta-python/recipes-devtools/python/python-jinja2.inc
@@ -8,7 +8,7 @@ SRC_URI[md5sum] = "61ef1117f945486472850819b8d1eb3d"
 SRC_URI[sha256sum] = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
 
 RDEPENDS_${PN} += "${PYTHON_PN}-io ${PYTHON_PN}-pickle ${PYTHON_PN}-crypt \
-    ${PYTHON_PN}-math ${PYTHON_PN}-netclient ${PYTHON_PN}-re ${PYTHON_PN}-textutils \
+    ${PYTHON_PN}-math ${PYTHON_PN}-netclient ${PYTHON_PN}-textutils \
     ${PYTHON_PN}-lang ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-markupsafe \
     ${PYTHON_PN}-json ${PYTHON_PN}-threading ${PYTHON_PN}-numbers"
 
diff --git a/meta-python/recipes-devtools/python/python-jinja2_2.10.bb b/meta-python/recipes-devtools/python/python-jinja2_2.10.bb
index ec8e7ed2d8..19b2bfaf68 100644
--- a/meta-python/recipes-devtools/python/python-jinja2_2.10.bb
+++ b/meta-python/recipes-devtools/python/python-jinja2_2.10.bb
@@ -1,2 +1,4 @@
 inherit pypi setuptools
 require python-jinja2.inc
+
+RDEPENDS_${PN} += "${PYTHON_PN}-re"
diff --git a/meta-python/recipes-devtools/python/python-jsonpatch.inc b/meta-python/recipes-devtools/python/python-jsonpatch.inc
index 838dbe3321..e559fb1ebe 100644
--- a/meta-python/recipes-devtools/python/python-jsonpatch.inc
+++ b/meta-python/recipes-devtools/python/python-jsonpatch.inc
@@ -8,5 +8,5 @@ inherit pypi
 SRC_URI[md5sum] = "0b20d819daf120ed3fef3be608f2ce18"
 SRC_URI[sha256sum] = "11f5ffdf543a83047a2f54ac28f8caad7f34724cb1ea26b27547fd974f1a2153"
 
-RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-re ${PYTHON_PN}-stringold"
+RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-stringold"
 
diff --git a/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb b/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb
index e45699a6d6..90cd318026 100644
--- a/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb
+++ b/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb
@@ -1,2 +1,4 @@
 inherit setuptools
 require python-jsonpatch.inc
+
+RDEPENDS_${PN} += "${PYTHON_PN}-re"
diff --git a/meta-python/recipes-devtools/python/python-jsonpointer.inc b/meta-python/recipes-devtools/python/python-jsonpointer.inc
index e678198cc4..5381fbe230 100644
--- a/meta-python/recipes-devtools/python/python-jsonpointer.inc
+++ b/meta-python/recipes-devtools/python/python-jsonpointer.inc
@@ -10,5 +10,4 @@ SRC_URI[sha256sum] = "c681af823545c731b7b38aedd5d4eee4c5eff87bc0f25e0ff25444a418
 
 RDEPENDS_${PN} += " \
     ${PYTHON_PN}-json \
-    ${PYTHON_PN}-re \
 "
diff --git a/meta-python/recipes-devtools/python/python-jsonpointer_1.14.bb b/meta-python/recipes-devtools/python/python-jsonpointer_1.14.bb
index 064bd6c5da..e13a776adb 100644
--- a/meta-python/recipes-devtools/python/python-jsonpointer_1.14.bb
+++ b/meta-python/recipes-devtools/python/python-jsonpointer_1.14.bb
@@ -1,2 +1,4 @@
 inherit setuptools
 require python-jsonpointer.inc
+
+RDEPENDS_${PN} += "${PYTHON_PN}-re"
diff --git a/meta-python/recipes-devtools/python/python-jsonschema.inc b/meta-python/recipes-devtools/python/python-jsonschema.inc
index db57c69a4c..b602b27b96 100644
--- a/meta-python/recipes-devtools/python/python-jsonschema.inc
+++ b/meta-python/recipes-devtools/python/python-jsonschema.inc
@@ -16,7 +16,6 @@ RDEPENDS_${PN} += " \
     ${PYTHON_PN}-numbers \
     ${PYTHON_PN}-pkgutil \
     ${PYTHON_PN}-pprint \
-    ${PYTHON_PN}-re \
     ${PYTHON_PN}-rfc3987 \
     ${PYTHON_PN}-shell \
     ${PYTHON_PN}-strict-rfc3339 \
diff --git a/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb b/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb
index 3bb5220188..55cbb20206 100644
--- a/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb
+++ b/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb
@@ -5,4 +5,5 @@ RDEPENDS_${PN} += " \
     ${PYTHON_PN}-argparse \
     ${PYTHON_PN}-contextlib \
     ${PYTHON_PN}-functools32 \
+    ${PYTHON_PN}-re \
 "
diff --git a/meta-python/recipes-devtools/python/python-markupsafe.inc b/meta-python/recipes-devtools/python/python-markupsafe.inc
index e50f8ce389..927f84452a 100644
--- a/meta-python/recipes-devtools/python/python-markupsafe.inc
+++ b/meta-python/recipes-devtools/python/python-markupsafe.inc
@@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad491
 PYPI_PACKAGE = "MarkupSafe"
 inherit pypi
 
-RDEPENDS_${PN} += "${PYTHON_PN}-re ${PYTHON_PN}-stringold"
+RDEPENDS_${PN} += "${PYTHON_PN}-stringold"
diff --git a/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb b/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb
index 5c9884b9f1..05bbe8a357 100644
--- a/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb
+++ b/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb
@@ -1,4 +1,6 @@
 inherit setuptools
 require python-markupsafe.inc
 
+RDEPENDS_${PN} += "${PYTHON_PN}-re"
+
 BBCLASSEXTEND = "native"
diff --git a/meta-python/recipes-devtools/python/python-simplejson.inc b/meta-python/recipes-devtools/python/python-simplejson.inc
index 95df3f356f..e28d51859e 100644
--- a/meta-python/recipes-devtools/python/python-simplejson.inc
+++ b/meta-python/recipes-devtools/python/python-simplejson.inc
@@ -10,7 +10,6 @@ SRC_URI[sha256sum] = "4c4ecf20e054716cc1e5a81cadc44d3f4027108d8dd0861d8b1e3bd7a3
 inherit pypi
 
 RDEPENDS_${PN} += "\
-    ${PYTHON_PN}-re \
     ${PYTHON_PN}-io \
     ${PYTHON_PN}-netserver \
     ${PYTHON_PN}-numbers \
diff --git a/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb b/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb
index e33edfebaa..24ad9a9608 100644
--- a/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb
+++ b/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb
@@ -1,2 +1,4 @@
 inherit setuptools
 require python-simplejson.inc
+
+RDEPENDS_${PN} += "${PYTHON_PN}-re"
-- 
cgit 1.2.3-korg