summaryrefslogtreecommitdiff
path: root/dev-ros/rosbash
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-ros/rosbash
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-ros/rosbash')
-rw-r--r--dev-ros/rosbash/Manifest18
-rw-r--r--dev-ros/rosbash/files/catkin_prefix.patch13
-rw-r--r--dev-ros/rosbash/files/catkin_prefix2.patch13
-rw-r--r--dev-ros/rosbash/rosbash-1.14.0.ebuild19
-rw-r--r--dev-ros/rosbash/rosbash-1.14.1.ebuild19
-rw-r--r--dev-ros/rosbash/rosbash-1.14.2.ebuild19
-rw-r--r--dev-ros/rosbash/rosbash-1.14.3.ebuild19
-rw-r--r--dev-ros/rosbash/rosbash-1.14.4.ebuild19
-rw-r--r--dev-ros/rosbash/rosbash-1.14.7.ebuild (renamed from dev-ros/rosbash/rosbash-1.14.6.ebuild)4
-rw-r--r--dev-ros/rosbash/rosbash-9999.ebuild6
10 files changed, 22 insertions, 127 deletions
diff --git a/dev-ros/rosbash/Manifest b/dev-ros/rosbash/Manifest
index b3e76c249c92..7fac7a1c5265 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -1,15 +1,5 @@
-AUX catkin_prefix2.patch 484 BLAKE2B 54fbc5a2dee390b46a9beccd804102f390e734ee827ddc986dc99da22140e5f33a1c01d642d30ff994531fdad6ecbc7f8034dd18ab7dec27fca569a2467ed363 SHA512 e85d430451a1679c8c7c401d72fe53c59e7c492ad89d812b212b1916bf098b91a43af1516f4d3a782c2dcb49f1fa9671812e31d466122cef33a4bc9a67fb211e
-DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
-DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
-DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
-DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-EBUILD rosbash-1.14.0.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
-EBUILD rosbash-1.14.1.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
-EBUILD rosbash-1.14.2.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
-EBUILD rosbash-1.14.3.ebuild 397 BLAKE2B af829f04684903bcd7f53ad019615f0a8357c63e6fca7949322cf945f4bd27352f631488539239a9c7625e6d9fda2df49e17d51c02ef31ea2309851b75d22b4b SHA512 b075932a3f05df7fb8bd3995eb826d4be5ffed44070b321fcd8749ff4433cd3813b563c7bce9e92611cf2c2a2b76caa1bde98d90f26fc0b6450fe072cd20c51d
-EBUILD rosbash-1.14.4.ebuild 397 BLAKE2B af829f04684903bcd7f53ad019615f0a8357c63e6fca7949322cf945f4bd27352f631488539239a9c7625e6d9fda2df49e17d51c02ef31ea2309851b75d22b4b SHA512 b075932a3f05df7fb8bd3995eb826d4be5ffed44070b321fcd8749ff4433cd3813b563c7bce9e92611cf2c2a2b76caa1bde98d90f26fc0b6450fe072cd20c51d
-EBUILD rosbash-1.14.6.ebuild 394 BLAKE2B 295b36b8c3afb1b4678cdecfcb7e46ac522f3b8caf96a89c356ff78a7362e068bf1ad8a01bc7b0b83236c5fe444e763d531119d9e3fa1e090b243dfb86a1e794 SHA512 f338ca82542c9dada42d31d57643943abc468443259e9c181e78c0dd1abdf1c5634498d31be0ee1784fcc28df57b2a066c89bb8e2e06bafb046e3a05ab83afb4
-EBUILD rosbash-9999.ebuild 397 BLAKE2B efc58a8a7f774d0c4c149f7d742532a12d1c20d919657c18c15e5113b9c78cfff54ff1ef248ac18136fe17c4ac867ab017a57c112e984cbded05e79131f580f4 SHA512 2cd1be7424bd28eea9ab74a9af96036be9c401e45d2ed33c9fad290694ceafc5ecb4245de700eacf0c5799324d92df08f7da2978c38e1409b0e7e01fccb01879
+AUX catkin_prefix.patch 443 BLAKE2B 4b366a582a5ebda3cfd644fb0319cd6cd07e9e983db9ed6cdb850bc6ecd393172e7e8dc93c30100470ba8417991e0487a7f85be53556472aa37947bae48ff2b6 SHA512 8662743559045f129a1dd94c7b42491f025b9038dff960f5d5259775760c0d3a0ae7086a6faae8bc6f511e72a0c5552013c88c4a8333043a0af6291b894ec5c1
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
+EBUILD rosbash-1.14.7.ebuild 408 BLAKE2B 64ca5af2d4932ca2acdbb32577dbc53ee8f983228b1b38a7433cfb2664f6400f318cd8634c8095d9f1536aad50b062cc7153b1a33a9875165e0629840aa8d1ac SHA512 0f40731f5c48b036bb6d2b1db284a8c5b96efb362566a3af7da7f3ed52850e47ea21f3a210a3eb29297b978dec87c446093e6ef284b518e1815bb901c3a4eba4
+EBUILD rosbash-9999.ebuild 408 BLAKE2B 64ca5af2d4932ca2acdbb32577dbc53ee8f983228b1b38a7433cfb2664f6400f318cd8634c8095d9f1536aad50b062cc7153b1a33a9875165e0629840aa8d1ac SHA512 0f40731f5c48b036bb6d2b1db284a8c5b96efb362566a3af7da7f3ed52850e47ea21f3a210a3eb29297b978dec87c446093e6ef284b518e1815bb901c3a4eba4
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/files/catkin_prefix.patch b/dev-ros/rosbash/files/catkin_prefix.patch
new file mode 100644
index 000000000000..89877b005f9d
--- /dev/null
+++ b/dev-ros/rosbash/files/catkin_prefix.patch
@@ -0,0 +1,13 @@
+Index: rosbash/scripts/rosrun
+===================================================================
+--- rosbash.orig/scripts/rosrun
++++ rosbash/scripts/rosrun
+@@ -47,7 +47,7 @@ case $2 in
+ ;;
+ esac
+
+-if [[ -n $CMAKE_PREFIX_PATH ]]; then
++if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then
+ _rosrun_IFS="$IFS"
+ IFS=$'\n'
+ catkin_package_libexec_dirs=($(catkin_find --without-underlays --libexec --share "$1" 2> /dev/null))
diff --git a/dev-ros/rosbash/files/catkin_prefix2.patch b/dev-ros/rosbash/files/catkin_prefix2.patch
deleted file mode 100644
index f36a7c7d6f08..000000000000
--- a/dev-ros/rosbash/files/catkin_prefix2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ros-1.12.5/tools/rosbash/scripts/rosrun
-===================================================================
---- ros-1.12.5.orig/tools/rosbash/scripts/rosrun
-+++ ros-1.12.5/tools/rosbash/scripts/rosrun
-@@ -47,7 +47,7 @@ case $2 in
- ;;
- esac
-
--if [[ -n $CMAKE_PREFIX_PATH ]]; then
-+if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then
- IFS=$'\n'
- catkin_package_libexec_dirs=(`catkin_find --without-underlays --libexec --share "$1" 2> /dev/null`)
- unset IFS
diff --git a/dev-ros/rosbash/rosbash-1.14.0.ebuild b/dev-ros/rosbash/rosbash-1.14.0.ebuild
deleted file mode 100644
index 50dcfac83ec6..000000000000
--- a/dev-ros/rosbash/rosbash-1.14.0.ebuild
+++ /dev/null
@@ -1,19 +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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.14.1.ebuild b/dev-ros/rosbash/rosbash-1.14.1.ebuild
deleted file mode 100644
index 50dcfac83ec6..000000000000
--- a/dev-ros/rosbash/rosbash-1.14.1.ebuild
+++ /dev/null
@@ -1,19 +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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.14.2.ebuild b/dev-ros/rosbash/rosbash-1.14.2.ebuild
deleted file mode 100644
index 50dcfac83ec6..000000000000
--- a/dev-ros/rosbash/rosbash-1.14.2.ebuild
+++ /dev/null
@@ -1,19 +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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.14.3.ebuild b/dev-ros/rosbash/rosbash-1.14.3.ebuild
deleted file mode 100644
index bef22c0c8f54..000000000000
--- a/dev-ros/rosbash/rosbash-1.14.3.ebuild
+++ /dev/null
@@ -1,19 +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/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.14.4.ebuild b/dev-ros/rosbash/rosbash-1.14.4.ebuild
deleted file mode 100644
index bef22c0c8f54..000000000000
--- a/dev-ros/rosbash/rosbash-1.14.4.ebuild
+++ /dev/null
@@ -1,19 +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/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.14.6.ebuild b/dev-ros/rosbash/rosbash-1.14.7.ebuild
index 1b7d1d2120d9..52caa3880598 100644
--- a/dev-ros/rosbash/rosbash-1.14.6.ebuild
+++ b/dev-ros/rosbash/rosbash-1.14.7.ebuild
@@ -14,6 +14,6 @@ LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND=""
+RDEPEND="dev-ros/rospack"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosbash/rosbash-9999.ebuild b/dev-ros/rosbash/rosbash-9999.ebuild
index f77828f9bf96..52caa3880598 100644
--- a/dev-ros/rosbash/rosbash-9999.ebuild
+++ b/dev-ros/rosbash/rosbash-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,6 +14,6 @@ LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND=""
+RDEPEND="dev-ros/rospack"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 20:56:40 +0000