From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 dev-ros/ros_environment/Manifest                   |  6 +++---
 .../ros_environment-1.2.0-r1.ebuild                | 25 ----------------------
 .../ros_environment/ros_environment-1.3.1.ebuild   | 24 +++++++++++++++++++++
 .../ros_environment/ros_environment-9999.ebuild    |  3 +--
 4 files changed, 28 insertions(+), 30 deletions(-)
 delete mode 100644 dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild
 create mode 100644 dev-ros/ros_environment/ros_environment-1.3.1.ebuild

(limited to 'dev-ros/ros_environment')

diff --git a/dev-ros/ros_environment/Manifest b/dev-ros/ros_environment/Manifest
index 88d83bdaf194..06b1a7cedeb0 100644
--- a/dev-ros/ros_environment/Manifest
+++ b/dev-ros/ros_environment/Manifest
@@ -1,5 +1,5 @@
 AUX catkinprefixpath.patch 1035 BLAKE2B 8054e8f2ae8a7f0060d44558fe32bdf607b81054249a2f7255878801e8abc2fdaa695609fc056b5a4cfc1fdbf7eae9adbd5057bd8f0831820bbb564b4778c8f2 SHA512 ce669139250c78e521e82ea23ca288c0b12cf7da17bbf06cf4cb3c425b3bc61ad182a475af3923fdbdf7c07f574077e2ad935d6c0c133d408ffc0f0d3f2d02ae
-DIST ros_environment-1.2.0.tar.gz 6366 BLAKE2B ff540b9e861d039739253b9effbfe06ec703f47b48d9bb7009b5caed5010ed8219a207bfd363c03b115d018965c2e584abbf58f649ea868e66e79d4dda11d1ae SHA512 1b89e3d6ea88fc0972bbe980bae0b663e9335adece8eb0d517cac76b0a412cbe6b9783a967d4a9b5ca1c3bf2a432bb826d28f6f1d9a33fcc33a75edeef0be20b
-EBUILD ros_environment-1.2.0-r1.ebuild 539 BLAKE2B 6f77782a4dab82a4f86d68f99732de9b5dae705f2489222a9d6f28853d3d1b66544d29ec37763b51bf7c06793c61616335b6cc6c7d3d0e85b27a1fcc0b8b19a6 SHA512 f5dfa8dc33b2a193623cea9b6aa105a7a4b9067aeb5d5e05b5317b3602da0ade7361c2cf25ff592505d062b06222cbe797bed51bd08d5007956dd17533fc3d81
-EBUILD ros_environment-9999.ebuild 539 BLAKE2B 6f77782a4dab82a4f86d68f99732de9b5dae705f2489222a9d6f28853d3d1b66544d29ec37763b51bf7c06793c61616335b6cc6c7d3d0e85b27a1fcc0b8b19a6 SHA512 f5dfa8dc33b2a193623cea9b6aa105a7a4b9067aeb5d5e05b5317b3602da0ade7361c2cf25ff592505d062b06222cbe797bed51bd08d5007956dd17533fc3d81
+DIST ros_environment-1.3.1.tar.gz 6533 BLAKE2B 50b6b24af91c5d96097873c3a05f258b2737053594a888ac5677147160708e192e1662558f33537b9510d206d5f00374ba3bec3b3491e5f51cfac3bcec842c1f SHA512 f47b9a7801ea4aa841b5127714e099c83e60fb42e8eedb726a4d3b23fcfb93c25c6f9bdc042a449399333c3165db1a72b9ebb25424981fe43bcfa5445f4678c5
+EBUILD ros_environment-1.3.1.ebuild 499 BLAKE2B 7aa52f2d0c596142e177f889234871cba1656cf3b5e7379d101315b6602e7449f05ecbf541785ed03d95d2bc113a9539fe8b79de0e0c51c388a92c3e1b259cd2 SHA512 73d5591ec8876fe33613814636fbc5bf3eed80591cb00ec279155333a1ef6f6353dfce927c12b4bc06f2bddf1e36550f2cfde0b44a2d1d4385820823e00d117b
+EBUILD ros_environment-9999.ebuild 499 BLAKE2B 7aa52f2d0c596142e177f889234871cba1656cf3b5e7379d101315b6602e7449f05ecbf541785ed03d95d2bc113a9539fe8b79de0e0c51c388a92c3e1b259cd2 SHA512 73d5591ec8876fe33613814636fbc5bf3eed80591cb00ec279155333a1ef6f6353dfce927c12b4bc06f2bddf1e36550f2cfde0b44a2d1d4385820823e00d117b
 MISC metadata.xml 333 BLAKE2B 87f510ba6f10a5a9473d242879151d307c5357749325c127ccd415d525968f1f4f3ae23e9e11d328f7cdc115f98b4dfc492dced529627229c6f01f133f67a032 SHA512 85ed3e7f2098353f25e0e6fd77afb64a602f828ab76ae6ac3c5a47eb02cfbb884e6b25473b1488ad9746fdba3ed50db47b90a191c5f2ec145587e33f0761406b
diff --git a/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild b/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild
deleted file mode 100644
index 1478d0978ba8..000000000000
--- a/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_environment"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="ROS environment variables"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!!<dev-ros/roslib-1.14.3"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkinprefixpath.patch" )
-
-src_configure() {
-	export ROS_DISTRO="Gentoo"
-	export ROS_DISTRO_OVERRIDE="Gentoo"
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/ros_environment/ros_environment-1.3.1.ebuild b/dev-ros/ros_environment/ros_environment-1.3.1.ebuild
new file mode 100644
index 000000000000..9b7f339511b4
--- /dev/null
+++ b/dev-ros/ros_environment/ros_environment-1.3.1.ebuild
@@ -0,0 +1,24 @@
+# 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_environment"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS environment variables"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!!<dev-ros/roslib-1.14.3"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkinprefixpath.patch" )
+
+src_configure() {
+	export ROS_DISTRO="Gentoo"
+	export ROS_DISTRO_OVERRIDE="Gentoo"
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/ros_environment/ros_environment-9999.ebuild b/dev-ros/ros_environment/ros_environment-9999.ebuild
index 1478d0978ba8..9b7f339511b4 100644
--- a/dev-ros/ros_environment/ros_environment-9999.ebuild
+++ b/dev-ros/ros_environment/ros_environment-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_environment"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
-- 
cgit v1.2.3