summaryrefslogtreecommitdiff
path: root/dev-ros/pr2_description
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-ros/pr2_description
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-ros/pr2_description')
-rw-r--r--dev-ros/pr2_description/Manifest13
-rw-r--r--dev-ros/pr2_description/files/tests.patch13
-rw-r--r--dev-ros/pr2_description/pr2_description-1.12.0.ebuild22
-rw-r--r--dev-ros/pr2_description/pr2_description-1.12.1.ebuild22
-rw-r--r--dev-ros/pr2_description/pr2_description-1.12.2.ebuild22
-rw-r--r--dev-ros/pr2_description/pr2_description-1.12.3.ebuild21
-rw-r--r--dev-ros/pr2_description/pr2_description-1.12.4.ebuild21
-rw-r--r--dev-ros/pr2_description/pr2_description-9999.ebuild21
8 files changed, 34 insertions, 121 deletions
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 036f45848a29..5b92752dccee 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -1,13 +1,4 @@
-AUX tests.patch 582 BLAKE2B 33a4ebdb4e3cb56f3dda7d16d8d952bfb72ec883e2ebabd2a19a98bdc0fe3aee995654b9a0463ef551ad4343b77feb5719fe24489b220928162e81c1ac5eeee2 SHA512 435c0f6b38ffd49282971d563f4e68daa482b63da3b44ff2599ff68f08be404b7921e125463494970a2c70ce938871c7d7bbea00d06c0ce61a76ff8117dcea8b
-DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
-DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
-DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
-DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_description-1.12.0.ebuild 549 BLAKE2B 261499258b614a14fa77defd99c39031d0c91a1e278f71084ade80392b3fddc89057deaf10847f8d8ef76c12c2a67a412f7c531d88677f7740445dd43cbb1d0e SHA512 7fbcc6f38b7363adcdb226d8b8a30c404f62477f5fbdfd17d89b263ffd2f29fff3d24d6af51145484857a9485d922d3079db06e470b42ef7f05093e7717a1ccf
-EBUILD pr2_description-1.12.1.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
-EBUILD pr2_description-1.12.2.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
-EBUILD pr2_description-1.12.3.ebuild 508 BLAKE2B 7f8fd26973b137fa104e5ea8563206776d83dc1f63236897b3b981c484745c77ea6401b44260bf138f0952f28cc164fc1ba8b8ff87e77d388dc1077ed79c07b4 SHA512 c604c0e50604781da7ec5a349b2c16c2a132690212f11ea241230ab446984890326a4ca0cdea0d2d5592e09603c5fd122c29737912fa330ed8b07eafb6b11078
-EBUILD pr2_description-1.12.4.ebuild 508 BLAKE2B fffaec46e8683f1ec5482fe208638c7c40cd4d132db71610a28ccc896bf87981a809873781343e09d3a808730c1ea2eeb4fe2eebc4d23599c91f19088e1e0679 SHA512 ac1c97ed6fdd930bb0addd0f9f4f6e3247e6bec7209cfec0ee7707d52ebd2c6d4be6052d3de9051bf3f741c0b769d3be900f4b7475047d5beff4b96ac074b3a0
-EBUILD pr2_description-9999.ebuild 508 BLAKE2B 7f8fd26973b137fa104e5ea8563206776d83dc1f63236897b3b981c484745c77ea6401b44260bf138f0952f28cc164fc1ba8b8ff87e77d388dc1077ed79c07b4 SHA512 c604c0e50604781da7ec5a349b2c16c2a132690212f11ea241230ab446984890326a4ca0cdea0d2d5592e09603c5fd122c29737912fa330ed8b07eafb6b11078
+EBUILD pr2_description-1.12.4.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
+EBUILD pr2_description-9999.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_description/files/tests.patch b/dev-ros/pr2_description/files/tests.patch
deleted file mode 100644
index 40c3a378d45d..000000000000
--- a/dev-ros/pr2_description/files/tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pr2_common-1.12.0/pr2_description/test/test_urdf.cpp
-===================================================================
---- pr2_common-1.12.0.orig/pr2_description/test/test_urdf.cpp
-+++ pr2_common-1.12.0/pr2_description/test/test_urdf.cpp
-@@ -100,7 +100,7 @@ int walker( std::string & result, int& t
- }
- xml_file.close();
-
-- boost::shared_ptr<urdf::ModelInterface> robot = urdf::parseURDF(xml_string);
-+ std::shared_ptr<urdf::ModelInterface> robot = urdf::parseURDF(xml_string);
- if (!robot) test_result = test_result || 1;
-
- }
diff --git a/dev-ros/pr2_description/pr2_description-1.12.0.ebuild b/dev-ros/pr2_description/pr2_description-1.12.0.ebuild
deleted file mode 100644
index 1a73af70cf05..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual, etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-ros/convex_decomposition
- dev-ros/ivcon
- test? ( dev-libs/urdfdom dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.12.1.ebuild b/dev-ros/pr2_description/pr2_description-1.12.1.ebuild
deleted file mode 100644
index afdbbe676ffc..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual, etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-ros/convex_decomposition
- dev-ros/ivcon
- test? ( dev-libs/urdfdom dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.12.2.ebuild b/dev-ros/pr2_description/pr2_description-1.12.2.ebuild
deleted file mode 100644
index afdbbe676ffc..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual, etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-ros/convex_decomposition
- dev-ros/ivcon
- test? ( dev-libs/urdfdom dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.12.3.ebuild b/dev-ros/pr2_description/pr2_description-1.12.3.ebuild
deleted file mode 100644
index 3f2d184f517e..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual, etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-ros/convex_decomposition
- dev-ros/ivcon
- test? ( dev-libs/urdfdom dev-cpp/gtest )"
diff --git a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
index ab216d560b19..6b8e630a5696 100644
--- a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
+++ b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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/pr2/pr2_common"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -14,8 +13,20 @@ LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/xacro[${PYTHON_SINGLE_USEDEP}]"
DEPEND="${RDEPEND}
+ test? (
+ dev-libs/urdfdom
+ dev-cpp/gtest
+ dev-ros/rosbash
+ )"
+BDEPEND="
dev-ros/convex_decomposition
dev-ros/ivcon
- test? ( dev-libs/urdfdom dev-cpp/gtest )"
+"
+
+src_test() {
+ # Needed for tests to find internal launch file
+ export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+ ros-catkin_src_test
+}
diff --git a/dev-ros/pr2_description/pr2_description-9999.ebuild b/dev-ros/pr2_description/pr2_description-9999.ebuild
index 3f2d184f517e..6b8e630a5696 100644
--- a/dev-ros/pr2_description/pr2_description-9999.ebuild
+++ b/dev-ros/pr2_description/pr2_description-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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/pr2/pr2_common"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -14,8 +13,20 @@ LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/xacro[${PYTHON_SINGLE_USEDEP}]"
DEPEND="${RDEPEND}
+ test? (
+ dev-libs/urdfdom
+ dev-cpp/gtest
+ dev-ros/rosbash
+ )"
+BDEPEND="
dev-ros/convex_decomposition
dev-ros/ivcon
- test? ( dev-libs/urdfdom dev-cpp/gtest )"
+"
+
+src_test() {
+ # Needed for tests to find internal launch file
+ export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+ ros-catkin_src_test
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 07:24:15 +0000