From 2702f21e52dca975eb4d9c676d1150c23613a140 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Sat, 26 Oct 2019 12:12:03 +0200
Subject: Revert "dev-ros/rosbag: follow upstream, switch to pycryptodome"

This reverts commit b04c5350b5f12286bc484d678b1b58d18d7839e9.
It does not build.

Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---
 dev-ros/rosbag/rosbag-1.14.3-r1.ebuild | 36 ++++++++++++++++++++++++++++++++++
 dev-ros/rosbag/rosbag-1.14.3-r2.ebuild | 36 ----------------------------------
 dev-ros/rosbag/rosbag-9999.ebuild      |  4 ++--
 3 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 dev-ros/rosbag/rosbag-1.14.3-r1.ebuild
 delete mode 100644 dev-ros/rosbag/rosbag-1.14.3-r2.ebuild

(limited to 'dev-ros')

diff --git a/dev-ros/rosbag/rosbag-1.14.3-r1.ebuild b/dev-ros/rosbag/rosbag-1.14.3-r1.ebuild
new file mode 100644
index 000000000000..f36222bd8660
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.14.3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_5} )
+
+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/pycrypto[${PYTHON_USEDEP}]
+	dev-python/python-gnupg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosbag/rosbag-1.14.3-r2.ebuild b/dev-ros/rosbag/rosbag-1.14.3-r2.ebuild
deleted file mode 100644
index e780a2e4b2b0..000000000000
--- a/dev-ros/rosbag/rosbag-1.14.3-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 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}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-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}] )"
diff --git a/dev-ros/rosbag/rosbag-9999.ebuild b/dev-ros/rosbag/rosbag-9999.ebuild
index e780a2e4b2b0..f36222bd8660 100644
--- a/dev-ros/rosbag/rosbag-9999.ebuild
+++ b/dev-ros/rosbag/rosbag-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-ros/genpy[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-libs/console_bridge:=
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
 	dev-python/python-gnupg[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-- 
cgit v1.2.3-65-gdbad