dev-python/rospkg: Add patch to fix python3 compatibility.

Package-Manager: portage-2.2.23

diff --git a/dev-python/rospkg/files/py3.patch b/dev-python/rospkg/files/py3.patch
new file mode 100644 (file)
index 0000000..268ff89
--- /dev/null
+++ b/dev-python/rospkg/files/py3.patch
@@ -0,0 +1,21 @@
+https://github.com/ros-infrastructure/rospkg/pull/90
+
+commit 7be8d9e5ec3c6bffd970e93053078b707879c7b9
+Author: Alexis Ballier <aballier@gentoo.org>
+Date:   Tue Oct 13 10:08:42 2015 +0200
+
+    src/rospkg/os_detect.py: Use "string in dict" instead of "dict.has_key(string)" for python3 compatibility.
+
+diff --git a/src/rospkg/os_detect.py b/src/rospkg/os_detect.py
+index 14b57c2..554b607 100644
+--- a/src/rospkg/os_detect.py
++++ b/src/rospkg/os_detect.py
+@@ -150,7 +150,7 @@ class FdoDetect(OsDetector):
+     """
+     def __init__(self, fdo_id):
+         release_info = read_os_release()
+-        if release_info is not None and release_info.has_key("ID") and release_info["ID"] == fdo_id:
++        if release_info is not None and "ID" in release_info and release_info["ID"] == fdo_id:
+             self.release_info = release_info
+         else:
+             self.release_info = None

diff --git a/dev-python/rospkg/rospkg-1.0.37.ebuild b/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
similarity index 98%
rename from dev-python/rospkg/rospkg-1.0.37.ebuild
rename to dev-python/rospkg/rospkg-1.0.37-r1.ebuild
index 06dd93b7b5c4267fb7cb76ec6c95a4aaf351c565..526c071695f8a7f631c7f4ce462fb1e052285ee8 100644 (file)
--- a/dev-python/rospkg/rospkg-1.0.37.ebuild
+++ b/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}
 "
 PATCHES=(
        "${FILESDIR}/norecurse.patch"
+       "${FILESDIR}/py3.patch"
 )
 
 python_test() {