From c75824ee10b4fa88fc9770cb885df8d4beab0f2a Mon Sep 17 00:00:00 2001
From: Herb Kuta <herb.kuta@lge.com>
Date: Thu, 25 Apr 2019 10:45:49 -0700
Subject: [PATCH] python*-rosdep: Upgrade to v0.16,1-1 (version from
 newer-platform-components.list)

---
 recipes-devtools/python/python-rosdep.inc     | 15 ++++----
 ...dependency-on-nose-from-setup.py-491.patch | 37 -------------------
 ...sdep_0.11.5.bb => python-rosdep_0.16.1.bb} |  0
 ...dep_0.11.5.bb => python3-rosdep_0.16.1.bb} |  0
 4 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 recipes-devtools/python/python-rosdep/0001-Remove-build-dependency-on-nose-from-setup.py-491.patch
 rename recipes-devtools/python/{python-rosdep_0.11.5.bb => python-rosdep_0.16.1.bb} (100%)
 rename recipes-devtools/python/{python3-rosdep_0.11.5.bb => python3-rosdep_0.16.1.bb} (100%)

diff --git a/recipes-devtools/python/python-rosdep.inc b/recipes-devtools/python/python-rosdep.inc
index a01105dd051..c332ec64387 100644
--- a/recipes-devtools/python/python-rosdep.inc
+++ b/recipes-devtools/python/python-rosdep.inc
@@ -1,16 +1,17 @@
 DESCRIPTION = "rosdep package manager abstraction tool for ROS"
 SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86a73ab7b555900fd6b51429658aca4c"
 SRCNAME = "rosdep"
 
-SRC_URI = "http://download.ros.org/downloads/rosdep/rosdep-${PV}.tar.gz \
-           file://0001-Remove-build-dependency-on-nose-from-setup.py-491.patch \
-           "
-SRC_URI[md5sum] = "2c5669bc5cafcb1df8cd21ce14844cc4"
-SRC_URI[sha256sum] = "46e072074270a1ea25411829814f4bdc1f34b358c950e9b8a7b75b4a40efd96a"
+SRC_URI = "https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz"
+SRC_URI[md5sum] = "c40eb20853f366e4fe0060e996b0f33e"
+SRC_URI[sha256sum] = "da3e69167bad39f3f7ffb50b5d1e11bf6c83cbad3812e1a5bc44040a622201e4"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
+# The Ubuntu version package has a "-<revision>" suffix, but the repo tag doesn't. Have the OE version package match the Ubuntu
+# one; assume it's always "-1".
+PKGV = "${PV}-1"
 
 RDEPENDS_${PN} += "${PYTHON_PN}-catkin-pkg ${PYTHON_PN}-rospkg ${PYTHON_PN}-pyyaml ${PYTHON_PN}-netclient ${PYTHON_PN}-rosdistro"
 
diff --git a/recipes-devtools/python/python-rosdep/0001-Remove-build-dependency-on-nose-from-setup.py-491.patch b/recipes-devtools/python/python-rosdep/0001-Remove-build-dependency-on-nose-from-setup.py-491.patch
deleted file mode 100644
index 17a1d702c36..00000000000
--- a/recipes-devtools/python/python-rosdep/0001-Remove-build-dependency-on-nose-from-setup.py-491.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From aae6b852e318015f46b2d49134594e14ca9d1321 Mon Sep 17 00:00:00 2001
-From: Dmitry Rozhkov <dmitry.rojkov@gmail.com>
-Date: Wed, 21 Dec 2016 23:03:53 +0200
-Subject: [PATCH] Remove build dependency on nose from setup.py (#491)
-
-Having nose required to run setup.py is needed only to enable
-the `nosetests` command which is redundant since it duplicates
-the `test` command. Also it prevents building python-rosdep
-in build environments where external downloads during build time
-are prohibited in order to provide reproducible and more reliable
-builds.
-
-Upstream-Status: Accepted [https://github.com/ros-infrastructure/rosdep/pull/491]
-
-Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
----
- setup.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 0f6950c..a2146cf 100644
---- a/setup.py
-+++ b/setup.py
-@@ -9,9 +9,8 @@ setup(
-     packages=['rosdep2', 'rosdep2.platforms'],
-     package_dir={'': 'src'},
-     install_requires=['catkin_pkg', 'rospkg >= 1.0.37', 'rosdistro >= 0.4.0', 'PyYAML >= 3.1'],
--    setup_requires=['nose >= 1.0'],
-     test_suite='nose.collector',
--    test_requires=['mock'],
-+    test_requires=['mock', 'nose >= 1.0'],
-     scripts=['scripts/rosdep', 'scripts/rosdep-source'],
-     author="Tully Foote, Ken Conley",
-     author_email="tfoote@osrfoundation.org",
--- 
-2.7.4
-
diff --git a/recipes-devtools/python/python-rosdep_0.11.5.bb b/recipes-devtools/python/python-rosdep_0.16.1.bb
similarity index 100%
rename from recipes-devtools/python/python-rosdep_0.11.5.bb
rename to recipes-devtools/python/python-rosdep_0.16.1.bb
diff --git a/recipes-devtools/python/python3-rosdep_0.11.5.bb b/recipes-devtools/python/python3-rosdep_0.16.1.bb
similarity index 100%
rename from recipes-devtools/python/python3-rosdep_0.11.5.bb
rename to recipes-devtools/python/python3-rosdep_0.16.1.bb