gentoo resync : 14.05.2020

5 files changed, 57 insertions, 4 deletions

diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index ffcc849abf22..9bb649c36b40 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,5 +1,8 @@
+AUX pycrypto.patch 402 BLAKE2B 2f784f93115b205285bb9eb9c910185f84871da7ecc5865304d220df7e1e9bea3799743a1f7a2a274423ec3fa4e367773814bd5fbb5cb074acb7252845ba6e94 SHA512 2343aca88929010f76389f31187b913f92f8d510a18a0d81b20c2c9accc2da68d15fd959404f11d363bdbe98f644ff2e76a70fdca4a718b490fa7f812a1b417e
 AUX yaml.patch 2142 BLAKE2B 3b42703dc19179852e53bb98e6b450014bfa21d3f253e912ff6ce970b0904ae700b724e761821fa9b5a880789de8c80a2820e9a64bb2e56fb1783b034f4291ad SHA512 a5c41b8b374b33c577375495e6599daa50685664794ffc0c9dd83118b4ea8d74c68e3831ea426a1a3bce585e35f9039a86fab4266840b4eb3302bb4454ac889a
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosbag-1.14.3-r3.ebuild 905 BLAKE2B 3b3f98ddac35f795a8d195c41883466b774c37e79028d3086ab7bbbbd0b405c194b4850590db6f954ad2ab7fa363f671ee8a018540c0e6108a05a7ac82293da6 SHA512 8528cfd738b64324316a057a16bc7155a330f2aa150f4dd7bdd241250ac509ce7f460564b0fc3a1eb1b6daa8e28f3eb7adc14b547f0e2545884567d0e68167ee
-EBUILD rosbag-9999.ebuild 868 BLAKE2B f9fc2095f638b533577dbf66da4ae52639727ea94e53ca333e3c1ed8d4c2feda124f102b504cab0980c34fcfe596c8d8d2d2c3f7f4813ca538962c99b30dae31 SHA512 b92e4042ed87e820530119ce22f6a8697fda8dfb8ace05904cfbba9b44e0cf6884bf158cd6c9b8d8f74a26f79847b57ba92b7e2f0c12187a2403272c39c2cf9a
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
+EBUILD rosbag-1.14.3-r3.ebuild 877 BLAKE2B 3b9c2e9d89270a5011c8480b791a72ae50b10292766c9eb5a8826e16ebbea61869a72a7b17709bdb1b2c7f422d9e02afee032df3f21b2921630fdb455acd3552 SHA512 09029c964574932beb792fc5008334e4f31e7428c9a098c87484c59fe7995b85d57febea5e3d76c8129ef011764543945b60d31ee358788e6b5ce540ccbc6830
+EBUILD rosbag-1.15.4.ebuild 881 BLAKE2B 2f6251489319075dac9ab839ca967cc88ab2f698c951e4381531c297cd01edf17570a2a70145f3d55b821bcef992d90c1dc1a6c11457ff2cb15ca946e6d144a6 SHA512 3c3cfe681870436df68d6c20b320ede685766c232c9545eb1319d0abde83ad7090ef61df84ad8a228203be83e750569afe44edf7e3142978377b224c83588622
+EBUILD rosbag-9999.ebuild 881 BLAKE2B 2f6251489319075dac9ab839ca967cc88ab2f698c951e4381531c297cd01edf17570a2a70145f3d55b821bcef992d90c1dc1a6c11457ff2cb15ca946e6d144a6 SHA512 3c3cfe681870436df68d6c20b320ede685766c232c9545eb1319d0abde83ad7090ef61df84ad8a228203be83e750569afe44edf7e3142978377b224c83588622
 MISC metadata.xml 418 BLAKE2B 2d84b96bfb428654a9b926100a8bd083afb2addc6db8b2e6fb003fab4bb8c1615df40ee13c863a3ddfe98a1a1f9b72af8310a80a9f610a01fe14366afde2e38d SHA512 d7579d9a25bf9f83513e3d8058ec845ee9b59e5d999128532b63d992cee8ef94922aee88140f044829442077c6f9ae80d6b0b0f554cf677690fdc88a17c9f260
diff --git a/dev-ros/rosbag/files/pycrypto.patch b/dev-ros/rosbag/files/pycrypto.patch
new file mode 100644
index 000000000000..c221d1bc086b
--- /dev/null
+++ b/dev-ros/rosbag/files/pycrypto.patch
@@ -0,0 +1,15 @@
+Index: rosbag/src/rosbag/bag.py
+===================================================================
+--- rosbag.orig/src/rosbag/bag.py
++++ rosbag/src/rosbag/bag.py
+@@ -50,8 +50,8 @@ import threading
+ import time
+ import yaml
+ 
+-from Cryptodome.Cipher import AES
+-from Cryptodome.Random import get_random_bytes
++from Crypto.Cipher import AES
++from Crypto.Random import get_random_bytes
+ 
+ import gnupg
+ 
diff --git a/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
index 7e936c76873d..7249f56e314a 100644
--- a/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
+++ b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
@@ -6,7 +6,6 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/rosbag/rosbag-1.15.4.ebuild b/dev-ros/rosbag/rosbag-1.15.4.ebuild
new file mode 100644
index 000000000000..572a7bcad9d9
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.15.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE="lz4"
+
+RDEPEND="
+	>=dev-ros/rosbag_storage-1.14
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/topic_tools
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-libs/console_bridge:=
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/python-gnupg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag/rosbag-9999.ebuild b/dev-ros/rosbag/rosbag-9999.ebuild
index 7d776ac0c2aa..572a7bcad9d9 100644
--- a/dev-ros/rosbag/rosbag-9999.ebuild
+++ b/dev-ros/rosbag/rosbag-9999.ebuild
@@ -6,7 +6,6 @@ EAPI=7
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -34,3 +33,4 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 RDEPEND="${RDEPEND}
 	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/pycrypto.patch" )