diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-ros/xacro | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-ros/xacro')
| -rw-r--r-- | dev-ros/xacro/Manifest | 5 | ||||
| -rw-r--r-- | dev-ros/xacro/files/tests.patch | 21 | ||||
| -rw-r--r-- | dev-ros/xacro/xacro-1.14.1.ebuild | 17 | ||||
| -rw-r--r-- | dev-ros/xacro/xacro-9999.ebuild | 17 |
4 files changed, 52 insertions, 8 deletions
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest index 1d4d06a7d1d2..587006448cd3 100644 --- a/dev-ros/xacro/Manifest +++ b/dev-ros/xacro/Manifest @@ -1,4 +1,5 @@ +AUX tests.patch 625 BLAKE2B 5ec4d6bca2278f40a4886371abd75beb0ff933d3b7e6e9e4554e7f9d63b521d2ff9d2c91c530177c818de2006bbc7db77e86ce3f4323017f870cb6b2a186ba9c SHA512 10da25011dc5c63d282d45862c35d9f900a90bc61059d6e703e50e2a94bdd4ca9c0f20d3fe6e5b03b3f98059e1bcb74272adcbb7f72d5e5f1d3ad4ce5a5f6bca DIST xacro-1.14.1.tar.gz 80879 BLAKE2B 6ce62c42e194d41bc2c0af322497f2ade2d4ac9e788cd15f3b7b6c976abae575b3bbb1224085d4e2d68cd10d3fbb665b9b333f91a38bdefe4a22f71d9270f005 SHA512 fb2272a4c4da47dcee26860ec94a5b4921401c6a4f0544181c7a9ae188c0cf6bb8ee2c0c0eb6e7fabd3f323c10d391dbafcc2b118384a32ecd18da6c8075ae10 -EBUILD xacro-1.14.1.ebuild 463 BLAKE2B b2a331233b1ad1ee58057838114e1285a5c7593e89b9646d91346132f6b9f3b3730518fe3fbd20dd45f767332fbca4acac2038d8a6672530a552f945959ec8ae SHA512 57e581c8615ad3f8e1cf90b1ecda1cdffb729ea228440338128bcce2aa827f77cdf9032e2842e01b11a2a8dfffa7fc585edae30c2452d6151f6e2a7b57ab4573 -EBUILD xacro-9999.ebuild 463 BLAKE2B b2a331233b1ad1ee58057838114e1285a5c7593e89b9646d91346132f6b9f3b3730518fe3fbd20dd45f767332fbca4acac2038d8a6672530a552f945959ec8ae SHA512 57e581c8615ad3f8e1cf90b1ecda1cdffb729ea228440338128bcce2aa827f77cdf9032e2842e01b11a2a8dfffa7fc585edae30c2452d6151f6e2a7b57ab4573 +EBUILD xacro-1.14.1.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2 +EBUILD xacro-9999.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2 MISC metadata.xml 323 BLAKE2B d43754a1147a95e3536569c858b3dafecbc9dd4ec06ef00d23d7948de3aaf40d15aabf502f6c1b5579c03139c06579517c86fddc6eaa61f970baf101d9fef68e SHA512 9c6fccac3f7ab699969eb90199aa9690d064f1d66cc003c157bf85bc3147ae42f1433ac1589f57ce5b05ebd78a44c7f1a92f99e3af29bdee58727c1a676afd37 diff --git a/dev-ros/xacro/files/tests.patch b/dev-ros/xacro/files/tests.patch new file mode 100644 index 000000000000..28d4b5768c35 --- /dev/null +++ b/dev-ros/xacro/files/tests.patch @@ -0,0 +1,21 @@ +Index: xacro-1.14.1/test/test-cmake.sh +=================================================================== +--- xacro-1.14.1.orig/test/test-cmake.sh ++++ xacro-1.14.1/test/test-cmake.sh +@@ -15,6 +15,7 @@ + test -d $1 || exit 2 + test -r $1/CMakeLists.txt || exit 2 + ++basedir=`pwd`/../ + dir=`basename $1` + + # redirect stdout and stderr to $dir.log +@@ -26,7 +27,7 @@ mkdir $dir + cd $dir + + echo "*** running cmake ***" +-cmake -DCATKIN_DEVEL_PREFIX=devel -DCMAKE_INSTALL_PREFIX=install $1 || exit $? ++cmake -DCATKIN_DEVEL_PREFIX="${basedir}/devel" -DCMAKE_INSTALL_PREFIX=install $1 || exit $? + + echo + echo "*** running make ***" diff --git a/dev-ros/xacro/xacro-1.14.1.ebuild b/dev-ros/xacro/xacro-1.14.1.ebuild index e29730c0f573..8383de0334c5 100644 --- a/dev-ros/xacro/xacro-1.14.1.ebuild +++ b/dev-ros/xacro/xacro-1.14.1.ebuild @@ -13,9 +13,20 @@ LICENSE="BSD" SLOT="0" IUSE="" -RDEPEND="dev-ros/roslint[${PYTHON_USEDEP}]" +RDEPEND="dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]" DEPEND="${RDEPEND} - test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] ) + test? ( + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") + ) " RDEPEND="${RDEPEND} - dev-ros/roslaunch[${PYTHON_USEDEP}]" + dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]" +PATCHES=( "${FILESDIR}/tests.patch" ) + +src_test() { + local sd="$(python_get_sitedir)" + local local_sd="${BUILD_DIR}/devel/${sd#${EPREFIX}/usr}" + export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" + PYTHONPATH="${local_sd}:${PYTHONPATH}" ros-catkin_src_test +} diff --git a/dev-ros/xacro/xacro-9999.ebuild b/dev-ros/xacro/xacro-9999.ebuild index e29730c0f573..8383de0334c5 100644 --- a/dev-ros/xacro/xacro-9999.ebuild +++ b/dev-ros/xacro/xacro-9999.ebuild @@ -13,9 +13,20 @@ LICENSE="BSD" SLOT="0" IUSE="" -RDEPEND="dev-ros/roslint[${PYTHON_USEDEP}]" +RDEPEND="dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]" DEPEND="${RDEPEND} - test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] ) + test? ( + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") + ) " RDEPEND="${RDEPEND} - dev-ros/roslaunch[${PYTHON_USEDEP}]" + dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]" +PATCHES=( "${FILESDIR}/tests.patch" ) + +src_test() { + local sd="$(python_get_sitedir)" + local local_sd="${BUILD_DIR}/devel/${sd#${EPREFIX}/usr}" + export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" + PYTHONPATH="${local_sd}:${PYTHONPATH}" ros-catkin_src_test +} |