summaryrefslogtreecommitdiff
path: root/dev-ros/urdf_tutorial
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-05-15 13:19:56 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-05-15 13:19:56 +0100
commitd302a5d7fc9caafba5c8a404f2891bb6ccdec311 (patch)
tree2a3ee43f080d1d0086964de8c29ccf1021fdfda7 /dev-ros/urdf_tutorial
parentea31ad0ed5501d0bf92267c35beaf06ac016bad2 (diff)
gentoo resync : 15.05.2018
Diffstat (limited to 'dev-ros/urdf_tutorial')
-rw-r--r--dev-ros/urdf_tutorial/Manifest9
-rw-r--r--dev-ros/urdf_tutorial/files/notest.patch14
-rw-r--r--dev-ros/urdf_tutorial/urdf_tutorial-0.2.5.ebuild23
-rw-r--r--dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild (renamed from dev-ros/urdf_tutorial/urdf_tutorial-0.2.4.ebuild)8
-rw-r--r--dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild3
5 files changed, 9 insertions, 48 deletions
diff --git a/dev-ros/urdf_tutorial/Manifest b/dev-ros/urdf_tutorial/Manifest
index 893907cad5b8..599326830b3f 100644
--- a/dev-ros/urdf_tutorial/Manifest
+++ b/dev-ros/urdf_tutorial/Manifest
@@ -1,10 +1,7 @@
-AUX notest.patch 474 BLAKE2B 169a8e930884fecbaca6376adfec8a7b02ce7fa82b81de9a32e93e6558bef58748bd36e77dbba6312ecc42e6d85fb387734a9354c3a247134384832d42ef4b2f SHA512 84ee122a63ea4035f3e51d07f4f9b621a564310140cfc2898ffb3db9009b55ea1385fd4d488c9ac488c498cbfbfafa95fc4a317ae6589750f4c61cb242f3bffc
AUX tests.patch 593 BLAKE2B c7597300a131235a1f60407d2123cdcdebb4e95328ba413b7243934a4401e084b814682c23ec58950db24f738b2a8e7064f62ab5784764461288de7b352cdcb3 SHA512 0ef25218dad5f9f4798557131cd10043b5ac3314723b2f6d2d2a5de961153748c8df955e14359338c289e1b3f20301beef173f5aa5d98524a612d9977d621406
-DIST urdf_tutorial-0.2.4.tar.gz 580617 BLAKE2B f8a52aec05c36d3b28f74d07945af369271d47707434d04e51a57de8e3346047f31164576a05c38b936ac68b137097e6eb542ec08fc483571ec83c264e53d65a SHA512 be1909b6b2f4efd5e0b846ab465d9b5b4096f729ffda7568194e4d3208604be83f7007160a767cc8f6df71edca9822e7e49e8f069e88e7b27d11690f7a17bf35
-DIST urdf_tutorial-0.2.5.tar.gz 866990 BLAKE2B 34d63b5ae2170684175db28db326d2b3c968161013208528551485729fc15b22d6e5e08e7deeb89920c0446b6ddbfe48f96eb2b0199bbffed5f305f0c053333a SHA512 5de1af9cf93063996ccd3a33a88fda022ab3182c9f5cd47c0217c63ca8501bac4bcb58f358870461ffdf1b110c47dc30734886359d5d3c30afb41412155fec04
DIST urdf_tutorial-0.3.0.tar.gz 871048 BLAKE2B 2bca4409696011c75e7b6c1ae811fe4caec3fe34b28ea80c9774b6068c64509a97452173c1e43ba92f77081419b58bf5f6987e1e9941eca8ce077c534636bad9 SHA512 1518cd2aa783e92dd7a996b9cff9df37f21f7585d59b6001bd9a42782b2a5d81e96e8d2502955283f29390c7fc4944250ff1d954ab6e511e0886f243c4aabbde
-EBUILD urdf_tutorial-0.2.4.ebuild 429 BLAKE2B cff4e1254f56b444368d66ad4cf4ad036db1e384238d3f0a34ed63e473214001e0f362b732b98dca63e8768f7485252d98da927f9b840ac109c4911703b6e0d5 SHA512 c346c13db8df1e9c8ce8f0f3216a07ce0d196b2b025ac50923c0cbec35002c411570062135fb831053191f8565e33e3b6e0d4f56ded8b93352b611357b99c0e0
-EBUILD urdf_tutorial-0.2.5.ebuild 443 BLAKE2B 0f2c3b1f8c7adb8f51af559b302c7ce6b00cc43d6d103c000f029c09bdc23b9314fed5bd6fa1f81b20102327737ff6babcc63b46872c57b5fbd56910e0768715 SHA512 036427ddeaec6995e851736d55af950a489b5e881e2020ffe774401a05253ffd980f2f1a313de1443820123fe542583d48878e97cf13e9d0b2fd66924163c5ba
+DIST urdf_tutorial-0.4.0.tar.gz 865626 BLAKE2B 42a8c3274e00393f846d4e2e9641740dad214bbcdc4f65095f96f2faac1f3709170d5719085d5927ca0c322f9b8cc57b2f8494353bec629978874870a8d37206 SHA512 256859d83fb5860df27cf8922043fb61158134c1ea06f3943fed3b8183c7384819a761d83bcb03a924a813185be07e89ca510076bfa1dfe4c2e52f561503fa88
EBUILD urdf_tutorial-0.3.0.ebuild 538 BLAKE2B bb697e25127e767527bfec3300afa588fd4b0dff34a2a9e5145723e96465922f790d02a571dc302094f85dd9e43a84aa41b81636aeab91d0519d49ede897fe09 SHA512 214b1c36eb845b4a8606753163fb781cc3a0a0f2d4283d34c0f5499e6b478a8255d338a4c7b754c73a1a813a28168ca857ed7d22295745996b45a33e7fabd1e9
-EBUILD urdf_tutorial-9999.ebuild 499 BLAKE2B 9557b01cf7717d55045b3b6f4772b9f1deb3192fdce09773e2874916633e5fd11c5f4da4df7ecc839849c7f60fb10b947d9b5a9564e7d1953180abbdfb2a47a6 SHA512 e9aed6394f4eeaae7f943ad3720ef1f08b91db1350bd466862314378218668ded2bb8a113c4208850a194d45484903ee166ea1b293dfa6eee6c989a38d9651f9
+EBUILD urdf_tutorial-0.4.0.ebuild 480 BLAKE2B 6a0825689ee5abba1ca565a4bac64b2671a991fedded31709728aff30a362b9588e74f39bec47001e739052ee7ace8cf89cb0c1df38e36988a5e13703c841db1 SHA512 5a01272a6a13efd6f309c3010b66d1f5cc70b8156d63a03c98dfaf22c1c3a6612ff0c65f47c4189717bf69cadbf00d86f4649fb23cfdaa49b19c9c15857efde7
+EBUILD urdf_tutorial-9999.ebuild 480 BLAKE2B 6a0825689ee5abba1ca565a4bac64b2671a991fedded31709728aff30a362b9588e74f39bec47001e739052ee7ace8cf89cb0c1df38e36988a5e13703c841db1 SHA512 5a01272a6a13efd6f309c3010b66d1f5cc70b8156d63a03c98dfaf22c1c3a6612ff0c65f47c4189717bf69cadbf00d86f4649fb23cfdaa49b19c9c15857efde7
MISC metadata.xml 331 BLAKE2B ef4364f8ec21105621d1d902a42bcd3c84797d9d72781e5fc1d5f80fc81cf5920aef1b68edd558a84510a3bfd8b1266f826c64d2e842c42b7006f980de8f1626 SHA512 b1e2cc797f0ddcd22bbc3c0c36c2339a95e66b05c1ac2042e7261fce8c9b55586aae1ee0633b98ead7eff51788f3debb5568c06567746af116665375f32b918f
diff --git a/dev-ros/urdf_tutorial/files/notest.patch b/dev-ros/urdf_tutorial/files/notest.patch
deleted file mode 100644
index 63e25b65dbed..000000000000
--- a/dev-ros/urdf_tutorial/files/notest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: urdf_tutorial-0.2.5/CMakeLists.txt
-===================================================================
---- urdf_tutorial-0.2.5.orig/CMakeLists.txt
-+++ urdf_tutorial-0.2.5/CMakeLists.txt
-@@ -4,7 +4,9 @@ project(urdf_tutorial)
- find_package(catkin REQUIRED roslaunch)
- catkin_package()
-
-+if(CATKIN_ENABLE_TESTING)
- roslaunch_add_file_check(launch)
-+endif()
-
- install(DIRECTORY config images meshes launch rviz urdf
- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.2.5.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.2.5.ebuild
deleted file mode 100644
index 845c092ca24d..000000000000
--- a/dev-ros/urdf_tutorial/urdf_tutorial-0.2.5.ebuild
+++ /dev/null
@@ -1,23 +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/ros/urdf_tutorial"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="URDF tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/urdf
- dev-ros/joint_state_publisher
- dev-ros/robot_state_publisher
- dev-ros/rviz
- dev-ros/xacro
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/notest.patch" )
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.2.4.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild
index 68caace85fb0..305da65fc713 100644
--- a/dev-ros/urdf_tutorial/urdf_tutorial-0.2.4.ebuild
+++ b/dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -15,9 +16,10 @@ IUSE=""
RDEPEND="
dev-ros/urdf
dev-ros/joint_state_publisher
- dev-ros/pr2_description
dev-ros/robot_state_publisher
dev-ros/rviz
dev-ros/xacro
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/roslaunch[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
index 5e71d2766709..305da65fc713 100644
--- a/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
+++ b/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
KEYWORDS="~amd64"
-ROS_SUBDIR="${PN}"
PYTHON_COMPAT=( python2_7 )
inherit ros-catkin