diff options
Diffstat (limited to 'dev-util')
32 files changed, 3 insertions, 1007 deletions
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest deleted file mode 100644 index eae184335c26..000000000000 --- a/dev-util/catkin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST catkin-0.8.10.tar.gz 218095 BLAKE2B cac62d7682e14e258cb7b8a55ae93c8792dcdb38b281c68b8135adfe9225c07a0c6c16717426f9b12ccc6aba91178cf18eeb05a0474ee6524131970e0c158c92 SHA512 0bab7a7b13484b09d301af52f7e563b78d8b80ac5cfc36a36a725baea7f23bf374d4814303875a4a1aa3981e346a3e5fa3f9b1e27c3ae819102dbc239ca767b1 diff --git a/dev-util/catkin/catkin-0.8.10.ebuild b/dev-util/catkin/catkin-0.8.10.ebuild deleted file mode 100644 index f74b3035208e..000000000000 --- a/dev-util/catkin/catkin-0.8.10.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros/catkin" -fi - -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) - -inherit ${SCM} cmake python-r1 - -DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS" -HOMEPAGE="https://wiki.ros.org/catkin" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/catkin_pkg[${PYTHON_USEDEP}] - dev-python/empy[${PYTHON_USEDEP}] - dev-util/cmake -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )" -BDEPEND="" - -PATCHES=( - "${FILESDIR}/tests.patch" - "${FILESDIR}/distutils-v2.patch" - "${FILESDIR}/catkin_prefix_path.patch" - "${FILESDIR}/gnuinstalldirs.patch" - "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" - "${FILESDIR}/package_xml.patch" - "${FILESDIR}/etc.patch" - "${FILESDIR}/gtest.patch" -) - -src_prepare() { - # fix libdir - sed -i \ - -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \ - -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \ - -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \ - -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \ - -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \ - cmake/*.cmake || die - cmake_src_prepare -} - -catkin_src_configure_internal() { - local sitedir="$(python_get_sitedir)" - mycmakeargs+=( - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" - ) - PYTHON_SCRIPTDIR="$(python_get_scriptdir)" cmake_src_configure -} - -src_configure() { - export PYTHONPATH="${S}/python" - local mycmakeargs=( - "-DCATKIN_ENABLE_TESTING=$(usex test)" - "-DCATKIN_BUILD_BINARY_PACKAGE=ON" - ) - python_foreach_impl catkin_src_configure_internal -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - python_foreach_impl cmake_src_test -} - -catkin_src_install_internal() { - export PYTHON_SCRIPTDIR="$(python_get_scriptdir)" - cmake_src_install - if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then - dodir /usr/bin - for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do - dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" - done - touch "${T}/.catkin_python_symlinks_generated" - fi -} - -src_install() { - python_foreach_impl catkin_src_install_internal - - doenvd "${FILESDIR}/40catkin" - - # needed to be considered as a workspace - touch "${ED}/usr/.catkin" - - python_foreach_impl python_optimize -} diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild deleted file mode 100644 index f74b3035208e..000000000000 --- a/dev-util/catkin/catkin-9999.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros/catkin" -fi - -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) - -inherit ${SCM} cmake python-r1 - -DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS" -HOMEPAGE="https://wiki.ros.org/catkin" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/catkin_pkg[${PYTHON_USEDEP}] - dev-python/empy[${PYTHON_USEDEP}] - dev-util/cmake -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )" -BDEPEND="" - -PATCHES=( - "${FILESDIR}/tests.patch" - "${FILESDIR}/distutils-v2.patch" - "${FILESDIR}/catkin_prefix_path.patch" - "${FILESDIR}/gnuinstalldirs.patch" - "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" - "${FILESDIR}/package_xml.patch" - "${FILESDIR}/etc.patch" - "${FILESDIR}/gtest.patch" -) - -src_prepare() { - # fix libdir - sed -i \ - -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \ - -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \ - -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \ - -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \ - -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \ - cmake/*.cmake || die - cmake_src_prepare -} - -catkin_src_configure_internal() { - local sitedir="$(python_get_sitedir)" - mycmakeargs+=( - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" - ) - PYTHON_SCRIPTDIR="$(python_get_scriptdir)" cmake_src_configure -} - -src_configure() { - export PYTHONPATH="${S}/python" - local mycmakeargs=( - "-DCATKIN_ENABLE_TESTING=$(usex test)" - "-DCATKIN_BUILD_BINARY_PACKAGE=ON" - ) - python_foreach_impl catkin_src_configure_internal -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - python_foreach_impl cmake_src_test -} - -catkin_src_install_internal() { - export PYTHON_SCRIPTDIR="$(python_get_scriptdir)" - cmake_src_install - if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then - dodir /usr/bin - for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do - dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" - done - touch "${T}/.catkin_python_symlinks_generated" - fi -} - -src_install() { - python_foreach_impl catkin_src_install_internal - - doenvd "${FILESDIR}/40catkin" - - # needed to be considered as a workspace - touch "${ED}/usr/.catkin" - - python_foreach_impl python_optimize -} diff --git a/dev-util/catkin/files/40catkin b/dev-util/catkin/files/40catkin deleted file mode 100644 index 469fa37997cc..000000000000 --- a/dev-util/catkin/files/40catkin +++ /dev/null @@ -1,3 +0,0 @@ -CATKIN_PREFIX_PATH=/usr -ROS_ROOT=/usr/share/ros -ROS_PACKAGE_PATH=/usr/share/ros_packages diff --git a/dev-util/catkin/files/catkin_prefix_path.patch b/dev-util/catkin/files/catkin_prefix_path.patch deleted file mode 100644 index 5c03a45f155b..000000000000 --- a/dev-util/catkin/files/catkin_prefix_path.patch +++ /dev/null @@ -1,76 +0,0 @@ -Allow CATKIN_PREFIX_PATH to override/complement CMAKE_PREFIX_PATH. -This serves two goals: when SYSROOT!=/, CMAKE_PREFIX_PATH is the same as when -SYSROOT=/ but we need to find packages in SYSROOT/CMAKE_PREFIX_PATH. - -Moreover, this allows to set CATKIN_PREFIX_PATH in global environment so that -ROS packages are properly configured without needed to source a shellrc file in -every shell session. This can't be done with CMAKE_PREFIX_PATH which is way too -generic. - -Index: catkin-0.6.16/cmake/all.cmake -=================================================================== ---- catkin-0.6.16.orig/cmake/all.cmake -+++ catkin-0.6.16/cmake/all.cmake -@@ -52,7 +52,11 @@ set(CMAKE_PREFIX_PATH_AS_IS ${CMAKE_PREF - - # list of unique catkin workspaces based on CMAKE_PREFIX_PATH - set(CATKIN_WORKSPACES "") --foreach(path ${CMAKE_PREFIX_PATH}) -+if(NOT DEFINED CATKIN_PREFIX_PATH) -+ set(CATKIN_PREFIX_PATH ${CMAKE_PREFIX_PATH}) -+endif() -+ -+foreach(path ${CATKIN_PREFIX_PATH}) - if(EXISTS "${path}/.catkin") - list(FIND CATKIN_WORKSPACES ${path} _index) - if(_index EQUAL -1) -Index: catkin-0.6.16/python/catkin/workspace.py -=================================================================== ---- catkin-0.6.16.orig/python/catkin/workspace.py -+++ catkin-0.6.16/python/catkin/workspace.py -@@ -44,7 +44,7 @@ def get_workspaces(): - """ - # get all cmake prefix paths - env_name = 'CMAKE_PREFIX_PATH' -- paths = [path for path in os.environ.get(env_name, '').split(os.pathsep) if path] -+ paths = [path for path in os.environ.get(env_name, '').split(os.pathsep) + os.environ.get('CATKIN_PREFIX_PATH', '').split(os.pathsep) if path] - # remove non-workspace paths - workspaces = [path for path in paths if os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))] - return workspaces -Index: catkin-0.6.16/cmake/catkinConfig.cmake.in -=================================================================== ---- catkin-0.6.16.orig/cmake/catkinConfig.cmake.in -+++ catkin-0.6.16/cmake/catkinConfig.cmake.in -@@ -64,6 +64,11 @@ if(catkin_FIND_COMPONENTS) - - # get search paths from CMAKE_PREFIX_PATH (which includes devel space) - set(paths "") -+ foreach(path ${CATKIN_PREFIX_PATH}) -+ if(IS_DIRECTORY ${path}/share/${component}/cmake) -+ list(APPEND paths ${path}/share/${component}/cmake) -+ endif() -+ endforeach() - foreach(path ${CMAKE_PREFIX_PATH}) - if(IS_DIRECTORY ${path}/share/${component}/cmake) - list(APPEND paths ${path}/share/${component}/cmake) -Index: catkin-0.6.16/cmake/toplevel.cmake -=================================================================== ---- catkin-0.6.16.orig/cmake/toplevel.cmake -+++ catkin-0.6.16/cmake/toplevel.cmake -@@ -35,10 +35,15 @@ else() - string(REPLACE ":" ";" CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) - endif() - endif() -+ if(NOT DEFINED CATKIN_PREFIX_PATH) -+ if(NOT "$ENV{CATKIN_PREFIX_PATH}" STREQUAL "") -+ string(REPLACE ":" ";" CATKIN_PREFIX_PATH $ENV{CATKIN_PREFIX_PATH}) -+ endif() -+ endif() - - # list of catkin workspaces - set(catkin_search_path "") -- foreach(path ${CMAKE_PREFIX_PATH}) -+ foreach(path ${CMAKE_PREFIX_PATH} ${CATKIN_PREFIX_PATH}) - if(EXISTS "${path}/.catkin") - list(FIND catkin_search_path ${path} _index) - if(_index EQUAL -1) diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch deleted file mode 100644 index 52f183cc8551..000000000000 --- a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch +++ /dev/null @@ -1,40 +0,0 @@ -Author: Eric Timmons -https://bugs.gentoo.org/show_bug.cgi?id=586104 - -Index: catkin-0.8.9/cmake/templates/_setup_util.py.in -=================================================================== ---- catkin-0.8.9.orig/cmake/templates/_setup_util.py.in -+++ catkin-0.8.9/cmake/templates/_setup_util.py.in -@@ -268,7 +268,7 @@ if __name__ == '__main__': - - if not args.local: - # environment at generation time -- CMAKE_PREFIX_PATH = r'@CMAKE_PREFIX_PATH_AS_IS@'.split(';') -+ CMAKE_PREFIX_PATH = r'@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';') - else: - # don't consider any other prefix path than this one - CMAKE_PREFIX_PATH = [] -Index: catkin-0.8.9/python/catkin/builder.py -=================================================================== ---- catkin-0.8.9.orig/python/catkin/builder.py -+++ catkin-0.8.9/python/catkin/builder.py -@@ -1164,6 +1164,7 @@ _CATKIN_SETUP_DIR= . "{0}/setup.sh" - 'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'", - 'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')", - 'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)), -+ 'CATKIN_PREFIX_PATH': ';'.join(os.environ.get('CATKIN_PREFIX_PATH','').split(os.pathsep)), - 'PYTHON_EXECUTABLE': sys.executable, - 'PYTHON_INSTALL_DIR': get_python_install_dir(), - } -Index: catkin-0.8.9/test/unit_tests/test_setup_util.py -=================================================================== ---- catkin-0.8.9.orig/test/unit_tests/test_setup_util.py -+++ catkin-0.8.9/test/unit_tests/test_setup_util.py -@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa - 'PYTHON_EXECUTABLE': sys.executable, - 'PYTHON_INSTALL_DIR': 'pythonX.Y/packages', - 'CMAKE_PREFIX_PATH_AS_IS': '', -+ 'CATKIN_PREFIX_PATH':'', - }) - with tempfile.NamedTemporaryFile('w+') as setup_util_file: - setup_util_file.write(data) diff --git a/dev-util/catkin/files/distutils-v2.patch b/dev-util/catkin/files/distutils-v2.patch deleted file mode 100644 index cb3aab220b05..000000000000 --- a/dev-util/catkin/files/distutils-v2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Allow to install scripts in PYTHON_SCRIPTDIR. -Needed for Gentoo multi-python support. - -Index: catkin-0.8.3/cmake/templates/python_distutils_install.sh.in -=================================================================== ---- catkin-0.8.3.orig/cmake/templates/python_distutils_install.sh.in -+++ catkin-0.8.3/cmake/templates/python_distutils_install.sh.in -@@ -30,4 +30,4 @@ echo_and_run /usr/bin/env \ - build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \ - install \ - --root="${DESTDIR-/}" \ -- @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@" -+ @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" diff --git a/dev-util/catkin/files/etc.patch b/dev-util/catkin/files/etc.patch deleted file mode 100644 index d95391f54193..000000000000 --- a/dev-util/catkin/files/etc.patch +++ /dev/null @@ -1,16 +0,0 @@ -So that files like python_logging.conf ends up in $EPREFIX/etc. -https://bugs.gentoo.org/show_bug.cgi?id=598537 - -Index: catkin-0.7.4/cmake/all.cmake -=================================================================== ---- catkin-0.7.4.orig/cmake/all.cmake -+++ catkin-0.7.4/cmake/all.cmake -@@ -163,7 +163,7 @@ unset(_CATKIN_CURRENT_PACKAGE) - - # set global install destinations - set(CATKIN_GLOBAL_BIN_DESTINATION bin) --set(CATKIN_GLOBAL_ETC_DESTINATION etc) -+set(CATKIN_GLOBAL_ETC_DESTINATION ../etc) - set(CATKIN_GLOBAL_INCLUDE_DESTINATION include) - set(CATKIN_GLOBAL_LIB_DESTINATION ${CMAKE_INSTALL_LIBDIR}) - set(CATKIN_GLOBAL_LIBEXEC_DESTINATION libexec) diff --git a/dev-util/catkin/files/gnuinstalldirs.patch b/dev-util/catkin/files/gnuinstalldirs.patch deleted file mode 100644 index 795eafc31965..000000000000 --- a/dev-util/catkin/files/gnuinstalldirs.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: catkin-0.6.16/cmake/all.cmake -=================================================================== ---- catkin-0.6.16.orig/cmake/all.cmake -+++ catkin-0.6.16/cmake/all.cmake -@@ -108,6 +108,10 @@ endif() - # include CMake functions - include(CMakeParseArguments) - -+# include GNUInstallDirs for LIBDIR -+# https://bugs.gentoo.org/show_bug.cgi?id=566670 -+include(GNUInstallDirs) -+ - # functions/macros: list_append_unique, safe_execute_process - # python-integration: catkin_python_setup.cmake, interrogate_setup_dot_py.py, templates/__init__.py.in, templates/script.py.in, templates/python_distutils_install.bat.in, templates/python_distutils_install.sh.in, templates/safe_execute_install.cmake.in - foreach(filename diff --git a/dev-util/catkin/files/gtest.patch b/dev-util/catkin/files/gtest.patch deleted file mode 100644 index 106b7e2886e8..000000000000 --- a/dev-util/catkin/files/gtest.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d9302318dece61acd0caa27d56f3817838f8f333 Mon Sep 17 00:00:00 2001 -From: seanyen <seanyen@microsoft.com> -Date: Thu, 6 Aug 2020 18:59:07 -0700 -Subject: [PATCH] Adding the new GTest search logic for Vcpkg. - ---- - cmake/test/gtest.cmake | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - -Index: catkin-0.8.8/cmake/test/gtest.cmake -=================================================================== ---- catkin-0.8.8.orig/cmake/test/gtest.cmake -+++ catkin-0.8.8/cmake/test/gtest.cmake -@@ -337,6 +337,31 @@ if(TARGET gtest AND TARGET gtest_main AN - set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}) - endif() - else() -+ # attempt to find the modern GTest config. -+ find_package(GTest 1.8.1 QUIET CONFIG) -+ if(GTest_FOUND AND TARGET GTest::gtest AND TARGET GTest::gtest_main) -+ set(GTEST_FOUND TRUE) -+ add_library(gtest ALIAS GTest::gtest) -+ add_library(gtest_main ALIAS GTest::gtest_main) -+ set(GTEST_INCLUDE_DIRS) -+ set(GTEST_LIBRARY_DIRS) -+ set(GTEST_LIBRARIES gtest) -+ set(GTEST_MAIN_LIBRARIES gtest_main) -+ set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}) -+ endif() -+ if(GTest_FOUND AND TARGET GTest::gmock AND TARGET GTest::gmock_main) -+ set(GMOCK_FOUND TRUE) -+ add_library(gmock ALIAS GTest::gmock) -+ add_library(gmock_main ALIAS GTest::gmock_main) -+ set(GMOCK_INCLUDE_DIRS) -+ set(GMOCK_LIBRARY_DIRS) -+ set(GMOCK_LIBRARIES gmock) -+ set(GMOCK_MAIN_LIBRARIES gmock_main) -+ set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES}) -+ endif() -+endif() -+ -+if(NOT GTEST_FOUND) - find_package(GTest QUIET) - endif() - if(NOT GMOCK_FOUND OR NOT GTEST_FOUND) diff --git a/dev-util/catkin/files/package_xml.patch b/dev-util/catkin/files/package_xml.patch deleted file mode 100644 index 52506ee680e7..000000000000 --- a/dev-util/catkin/files/package_xml.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: catkin-0.7.6/cmake/catkin_package.cmake -=================================================================== ---- catkin-0.7.6.orig/cmake/catkin_package.cmake -+++ catkin-0.7.6/cmake/catkin_package.cmake -@@ -527,4 +527,7 @@ function(_catkin_package) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml - DESTINATION share/${PROJECT_NAME} - ) -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml -+ DESTINATION share/ros_packages/${PROJECT_NAME} -+ ) - endfunction() -Index: catkin-0.7.6/cmake/all.cmake -=================================================================== ---- catkin-0.7.6.orig/cmake/all.cmake -+++ catkin-0.7.6/cmake/all.cmake -@@ -156,7 +156,7 @@ foreach(filename - endforeach() - - # output catkin version for debugging --_catkin_package_xml(${CMAKE_BINARY_DIR}/catkin/catkin_generated/version DIRECTORY ${catkin_EXTRAS_DIR}/..) -+#_catkin_package_xml(${CMAKE_BINARY_DIR}/catkin/catkin_generated/version DIRECTORY ${catkin_EXTRAS_DIR}/../../ros_packages/catkin) - message(STATUS "catkin ${catkin_VERSION}") - # ensure that no current package name is set - unset(_CATKIN_CURRENT_PACKAGE) -Index: catkin-0.7.6/cmake/catkin_metapackage.cmake -=================================================================== ---- catkin-0.7.6.orig/cmake/catkin_metapackage.cmake -+++ catkin-0.7.6/cmake/catkin_metapackage.cmake -@@ -42,4 +42,7 @@ function(catkin_metapackage) - install(FILES ${ARG_DIRECTORY}/package.xml - DESTINATION share/${PROJECT_NAME} - ) -+ install(FILES ${ARG_DIRECTORY}/package.xml -+ DESTINATION share/ros_packages/${PROJECT_NAME} -+ ) - endfunction() diff --git a/dev-util/catkin/files/tests.patch b/dev-util/catkin/files/tests.patch deleted file mode 100644 index d78136a8ec13..000000000000 --- a/dev-util/catkin/files/tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix tests. -Allow them to run even with CATKIN_BUILD_BINARY_PACKAGE set. - -Index: catkin-0.6.9/cmake/test/tests.cmake -=================================================================== ---- catkin-0.6.9.orig/cmake/test/tests.cmake -+++ catkin-0.6.9/cmake/test/tests.cmake -@@ -40,9 +40,6 @@ if(DEFINED CATKIN_ENABLE_TESTING AND NOT - return() - endif() - --# do not enable ctest's on the farm, since they are automatically executed by the current rules files --# and since the tests have not been build rostests would hang forever --if(NOT CATKIN_BUILD_BINARY_PACKAGE) - # do not enable ctest's for dry packages, since they have a custom test target which must not be overwritten - if(NOT ROSBUILD_init_called) - message(STATUS "Call enable_testing()") -@@ -50,9 +47,6 @@ if(NOT CATKIN_BUILD_BINARY_PACKAGE) - else() - message(STATUS "Skip enable_testing() for dry packages") - endif() --else() -- message(STATUS "Skip enable_testing() when building binary package") --endif() - - # allow overriding CATKIN_TEST_RESULTS_DIR when explicitly passed to CMake as a command line argument - if(DEFINED CATKIN_TEST_RESULTS_DIR) -Index: catkin-9999/test/utils.py -=================================================================== ---- catkin-9999.orig/test/utils.py -+++ catkin-9999/test/utils.py -@@ -189,6 +189,8 @@ class AbstractCatkinWorkspaceTest(unitte - prefix_path = self.installdir - args += ["-DCMAKE_PREFIX_PATH=%s" % (prefix_path)] - -+ args += ["-DCMAKE_INSTALL_LIBDIR=lib"] -+ - if not os.path.isdir(this_builddir): - os.makedirs(this_builddir) - cmd = ["cmake", this_srcdir] + args diff --git a/dev-util/catkin/metadata.xml b/dev-util/catkin/metadata.xml deleted file mode 100644 index 4766f851ded4..000000000000 --- a/dev-util/catkin/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ros@gentoo.org</email> - <name>Gentoo ROS Project</name> - </maintainer> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest index f85572306458..ff1a83b19c6b 100644 --- a/dev-util/kdevelop-pg-qt/Manifest +++ b/dev-util/kdevelop-pg-qt/Manifest @@ -1,2 +1 @@ -DIST kdevelop-pg-qt-2.2.1_p20220904-72138ed0.tar.gz 1131103 BLAKE2B a388fa38e27115912af7a589f43dc6f95f4af4790435bfda6344fa62245acb37254d86df48bda9201dc6341dc88f04d4bba7c3cfae90189a88e506af66fab95c SHA512 953dc8e76a7cf8d46963ec3b41252b9b19a03275469cfc145b649ef999df1b8aa8f45666616ee56c139eeb4b1e90e6f2fd85d18a1c2371a6133da674ce187106 DIST kdevelop-pg-qt-2.2.2.tar.xz 660708 BLAKE2B 822753315969cf4176ed1a25bb27516661af865a4c337f069a892b008802359f4a933ebc9e9e1ac0c91d2314a6ec5cdcf91db4641e624e07373dfec47a71dcf1 SHA512 e82f2fa2aafa2c9f949e298989de70a0455c30f6bef4a40e38977c23ad645ee49a0a8c57b5c45d0ddfef13ee7b7e4efd2dc2ed3003a456f24108161415700369 diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild deleted file mode 100644 index e8feea90ccf1..000000000000 --- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_CATEGORY="kdevelop" -KDE_ORG_COMMIT="72138ed04d427f520e65b146525632e967177abe" -inherit ecm kde.org - -DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins" -HOMEPAGE="https://www.kdevelop.org/" - -LICENSE="LGPL-2+ LGPL-2.1+" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" - -BDEPEND=" - sys-devel/bison - sys-devel/flex -" diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest index 06df80592dde..fc8383cb9cd6 100644 --- a/dev-util/poke/Manifest +++ b/dev-util/poke/Manifest @@ -1,3 +1,3 @@ DIST poke-2.3.tar.gz 7369945 BLAKE2B fe9274099a9ddacf1f46b7cec1f98cc6c442b24f149efbf4320a74a270dc8bad7cf3f87df817c9968a13ece763573b36f0ec99699cb9c7742b7be9023a4fca39 SHA512 101ef0009676c02f72ffb4889a02c9a161f29f412685249c7166f69077b0cd1b19d940567ebb86894bacf2278a2e138354fd49456f12b05a4c1957f437ff1d86 DIST poke-2.4.tar.gz 7372092 BLAKE2B 64b8b22713bb581c30b624200c0a283a8de548895db2c21d83babbb18a93f3a8975dd7af752bd7ea856242f90035add249fbb62462ac632bec351598bcca0fe5 SHA512 6fa1097a5cbbd4171b6a390934c5648b4c382b8b8c8dd4955bba82cb57107f67e23b39f2df2081904a02f457e6c5b2d10baed710da3ed4b9b9eab3f4127e12bc -DIST poke-2.90.0.tar.gz 7503533 BLAKE2B d5ceb3ae95025d34ba6efb14b437d9bb4c24c2bbdd782a551ca58ef45044c6059f073816a95a5eafe6d2e44eed5cb32b006a6bdbd74143d1b2ae0f885c131be8 SHA512 44e48988b20ddfebc988be9027455e9dda5a59aef09822967f275645b07155971b6de2e4554560c825df19625e01fc565469488826d6f687c92865f45ab35065 +DIST poke-2.90.1.tar.gz 7512925 BLAKE2B 38c9283f1c0b183b1b74c2ebd347edf6e9a9191d19070f7da32e6b0f520ec8197be3a813bc98160b47363cd11069bdaf84bb528498fe51cf2dcadf0bfa06a25e SHA512 f5823bed61ab64c2cdde83c918716fe64ad5552499023b2f5202130d6b2bab405c9d1cb1e12c7f190749689d86bf36f4edfe140ce748ac4c5f03d219197558d3 diff --git a/dev-util/poke/poke-2.90.0.ebuild b/dev-util/poke/poke-2.90.1.ebuild index 77f62ea257d8..6bb0f34eb2c4 100644 --- a/dev-util/poke/poke-2.90.0.ebuild +++ b/dev-util/poke/poke-2.90.1.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then sys-devel/bison sys-devel/flex " -elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) ]]; then +elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz" REGEN_BDEPEND="" else diff --git a/dev-util/poke/poke-9999.ebuild b/dev-util/poke/poke-9999.ebuild index 77f62ea257d8..6bb0f34eb2c4 100644 --- a/dev-util/poke/poke-9999.ebuild +++ b/dev-util/poke/poke-9999.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then sys-devel/bison sys-devel/flex " -elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) ]]; then +elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz" REGEN_BDEPEND="" else diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest deleted file mode 100644 index 1067ff13ddfd..000000000000 --- a/dev-util/rosdep/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST rosdep-0.21.0.tar.gz 312028 BLAKE2B 7ad3bfe027c574fdc82952085a5ea447e811b6858fca13121ad25cf1bda04e33091782b69c4a8f9a71383f1716678bd19c8752600987f7c41016ee93eed1ddcb SHA512 fb784c1603087b62444d767f1ce9e45303d2161e69ac82fec0edeeefd99f0c70e14b25b64a516df01e72aaa3a1b4a25b9507855edaa169c3af945e6581d9751d -DIST rosdep-0.22.1.tar.gz 313822 BLAKE2B 537756d107e0cdea2333743bf387cfacde295a1cd368d212800fcfc9a967861b5ecd0a30e9ad53870fce7ea69d604650bb74d7331b3eb46adacffe9c2b8a0b57 SHA512 62964b2ca876cdf0cb392ba7b15a0bc5f5a735469fa9abfd0a0b0117a99fa47d5f8b7a415d9d0b7ebce1d399a964b6ee12d46c2ace8ff856cb17f2153f5cabd3 diff --git a/dev-util/rosdep/files/tests.patch b/dev-util/rosdep/files/tests.patch deleted file mode 100644 index fa4fcfdb36a8..000000000000 --- a/dev-util/rosdep/files/tests.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: rosdep-0.19.0/test/test_rosdep_gentoo.py -=================================================================== ---- rosdep-0.19.0.orig/test/test_rosdep_gentoo.py -+++ rosdep-0.19.0/test/test_rosdep_gentoo.py -@@ -183,13 +183,11 @@ def test_PortageInstaller(): - - mock_method.return_value = ['a', 'b'] - -- expected = [['sudo', '-H', 'emerge', 'a'], -- ['sudo', '-H', 'emerge', 'b']] -+ expected = [['sudo', '-H', 'emerge', 'a', 'b']] - val = installer.get_install_command(['whatever'], interactive=False) - assert val == expected, val - -- expected = [['sudo', '-H', 'emerge', '-a', 'a'], -- ['sudo', '-H', 'emerge', '-a', 'b']] -+ expected = [['sudo', '-H', 'emerge', '-a', 'a', 'b']] - val = installer.get_install_command(['whatever'], interactive=True) - assert val == expected, val - diff --git a/dev-util/rosdep/metadata.xml b/dev-util/rosdep/metadata.xml deleted file mode 100644 index 4766f851ded4..000000000000 --- a/dev-util/rosdep/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ros@gentoo.org</email> - <name>Gentoo ROS Project</name> - </maintainer> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/rosdep/rosdep-0.21.0.ebuild b/dev-util/rosdep/rosdep-0.21.0.ebuild deleted file mode 100644 index 09f1a8310070..000000000000 --- a/dev-util/rosdep/rosdep-0.21.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep" -fi - -inherit ${SCM} distutils-r1 - -DESCRIPTION="Command-line tool for installing ROS system dependencies" -HOMEPAGE="https://wiki.ros.org/rosdep" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz - https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" - -# Tests need network -RESTRICT="test" -PROPERTIES+=" test_network" - -RDEPEND=" - dev-python/catkin_pkg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-python/rosdistro[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - ) -" -PATCHES=( "${FILESDIR}/tests.patch" ) - -distutils_enable_tests pytest - -src_test() { - unset ROS_DISTRO - distutils-r1_src_test -} - -pkg_postrm() { - if [ "${ROOT:-/}" = "/" ] ; then - einfo "Removing rosdep default sources list." - rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" - fi -} - -pkg_postinst() { - if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then - einfo "Initializing rosdep" - rosdep init - fi -} diff --git a/dev-util/rosdep/rosdep-0.22.1.ebuild b/dev-util/rosdep/rosdep-0.22.1.ebuild deleted file mode 100644 index fc5f3b50cc9d..000000000000 --- a/dev-util/rosdep/rosdep-0.22.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -inherit distutils-r1 - -DESCRIPTION="Command-line tool for installing ROS system dependencies" -HOMEPAGE="https://wiki.ros.org/rosdep" - -if [[ ${PV} = *9999 ]]; then - EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep" - inherit git-r3 -else - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz - https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" - -# Tests need network -RESTRICT="test" -PROPERTIES="test_network" - -RDEPEND=" - dev-python/catkin_pkg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-python/rosdistro[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - ) -" -PATCHES=( "${FILESDIR}/tests.patch" ) - -distutils_enable_tests pytest - -src_test() { - unset ROS_DISTRO - distutils-r1_src_test -} - -pkg_postrm() { - if [ "${ROOT:-/}" = "/" ] ; then - einfo "Removing rosdep default sources list." - rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" - fi -} - -pkg_postinst() { - if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then - einfo "Initializing rosdep" - rosdep init - fi -} diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild deleted file mode 100644 index fc5f3b50cc9d..000000000000 --- a/dev-util/rosdep/rosdep-9999.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -inherit distutils-r1 - -DESCRIPTION="Command-line tool for installing ROS system dependencies" -HOMEPAGE="https://wiki.ros.org/rosdep" - -if [[ ${PV} = *9999 ]]; then - EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep" - inherit git-r3 -else - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz - https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" - -# Tests need network -RESTRICT="test" -PROPERTIES="test_network" - -RDEPEND=" - dev-python/catkin_pkg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-python/rosdistro[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - ) -" -PATCHES=( "${FILESDIR}/tests.patch" ) - -distutils_enable_tests pytest - -src_test() { - unset ROS_DISTRO - distutils-r1_src_test -} - -pkg_postrm() { - if [ "${ROOT:-/}" = "/" ] ; then - einfo "Removing rosdep default sources list." - rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" - fi -} - -pkg_postinst() { - if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then - einfo "Initializing rosdep" - rosdep init - fi -} diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest deleted file mode 100644 index 67470f32098b..000000000000 --- a/dev-util/rosinstall/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rosinstall-0.7.8.tar.gz 26430 BLAKE2B fae82276f5376a94914272e60b2e3b0f81cb37bd7b41e0a4df73c8b58d19a73505a0c5e193495fd59c931c04265cbb372abfad19fd4043fc77e5224127bd97f5 SHA512 a53ae8fb96f9dda4671b22dfd9dbadc18d1e4adbf34a50b6706baf971c1c7ee418e14641d334346b02638f06c10d1bc984b4759c92a39510dd0044fbc346be67 diff --git a/dev-util/rosinstall/metadata.xml b/dev-util/rosinstall/metadata.xml deleted file mode 100644 index 4766f851ded4..000000000000 --- a/dev-util/rosinstall/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ros@gentoo.org</email> - <name>Gentoo ROS Project</name> - </maintainer> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild deleted file mode 100644 index 801637f9df41..000000000000 --- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -DISTUTILS_IN_SOURCE_BUILD="yes" -inherit distutils-r1 - -DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS" -HOMEPAGE="https://wiki.ros.org/rosinstall https://wiki.ros.org/roslocate" - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vcstools/rosinstall" -else - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz - https://github.com/vcstools/rosinstall/archive/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" - -RDEPEND=" - dev-python/catkin_pkg[${PYTHON_USEDEP}] - >=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}] - dev-python/rosdistro[${PYTHON_USEDEP}] - >=dev-util/wstool-0.1.12[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND} - test? ( - dev-vcs/git - dev-vcs/bzr - dev-vcs/mercurial - app-shells/zsh - ) -" - -distutils_enable_tests nose - -src_test() { - # From travis.yml - # Set git config to silence some stuff in the tests - git config --global user.email "foo@example.com" || die - git config --global user.name "Foo Bar" || die - # Set the hg user - echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc || die - # Set the bzr user - bzr whoami "Your Name <name@example.com>" || die - # command to run tests - # Local tests work even if ros.org is down - local -x ROSINSTALL_SKIP_PYTHON3=1 - - distutils-r1_src_test -} diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild deleted file mode 100644 index 801637f9df41..000000000000 --- a/dev-util/rosinstall/rosinstall-9999.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -DISTUTILS_IN_SOURCE_BUILD="yes" -inherit distutils-r1 - -DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS" -HOMEPAGE="https://wiki.ros.org/rosinstall https://wiki.ros.org/roslocate" - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vcstools/rosinstall" -else - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz - https://github.com/vcstools/rosinstall/archive/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" - -RDEPEND=" - dev-python/catkin_pkg[${PYTHON_USEDEP}] - >=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}] - dev-python/rosdistro[${PYTHON_USEDEP}] - >=dev-util/wstool-0.1.12[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND} - test? ( - dev-vcs/git - dev-vcs/bzr - dev-vcs/mercurial - app-shells/zsh - ) -" - -distutils_enable_tests nose - -src_test() { - # From travis.yml - # Set git config to silence some stuff in the tests - git config --global user.email "foo@example.com" || die - git config --global user.name "Foo Bar" || die - # Set the hg user - echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc || die - # Set the bzr user - bzr whoami "Your Name <name@example.com>" || die - # command to run tests - # Local tests work even if ros.org is down - local -x ROSINSTALL_SKIP_PYTHON3=1 - - distutils-r1_src_test -} diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest deleted file mode 100644 index e04952ad72f1..000000000000 --- a/dev-util/wstool/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wstool-0.1.18.tar.gz 80595 BLAKE2B ed90fc5c63ab5d775dfb49ddacc6da6e285aeb5078cf471c0d504659a9e322fde27797e4d05fd56dff4b9958558200cf05e46cf7ae71fd1231ab63048e668808 SHA512 fda9c679183c605048ed024a57b07fd2d9b644978a3e4ff89c3716b74d8e4ba0124779bcdf88a75fdbbf47c765b7ab63db7c84a55a6e1744fc6f955649590c48 diff --git a/dev-util/wstool/metadata.xml b/dev-util/wstool/metadata.xml deleted file mode 100644 index 4766f851ded4..000000000000 --- a/dev-util/wstool/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ros@gentoo.org</email> - <name>Gentoo ROS Project</name> - </maintainer> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/wstool/wstool-0.1.18.ebuild b/dev-util/wstool/wstool-0.1.18.ebuild deleted file mode 100644 index e33233f817bb..000000000000 --- a/dev-util/wstool/wstool-0.1.18.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -DISTUTILS_IN_SOURCE_BUILD="yes" -inherit distutils-r1 - -DESCRIPTION="Commands to manage several local SCM repositories for ROS" -HOMEPAGE="https://wiki.ros.org/wstool" - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vcstools/wstool" -else - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz - https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" - -RDEPEND=" - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}] -" -BDEPEND="${RDEPEND} - dev-python/sphinx - test? ( - dev-vcs/git - dev-vcs/bzr - dev-vcs/mercurial - dev-vcs/subversion - ) -" - -distutils_enable_tests nose - -src_test() { - # From travis.yml - # Set git config to silence some stuff in the tests - git config --global user.email "foo@example.com" || die - git config --global user.name "Foo Bar" || die - # Set the hg user - echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc || die - # Set the bzr user - bzr whoami "Your Name <name@example.com>" || die - # command to run tests - distutils-r1_src_test -} diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild deleted file mode 100644 index e33233f817bb..000000000000 --- a/dev-util/wstool/wstool-9999.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -DISTUTILS_IN_SOURCE_BUILD="yes" -inherit distutils-r1 - -DESCRIPTION="Commands to manage several local SCM repositories for ROS" -HOMEPAGE="https://wiki.ros.org/wstool" - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vcstools/wstool" -else - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz - https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" - -RDEPEND=" - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}] -" -BDEPEND="${RDEPEND} - dev-python/sphinx - test? ( - dev-vcs/git - dev-vcs/bzr - dev-vcs/mercurial - dev-vcs/subversion - ) -" - -distutils_enable_tests nose - -src_test() { - # From travis.yml - # Set git config to silence some stuff in the tests - git config --global user.email "foo@example.com" || die - git config --global user.name "Foo Bar" || die - # Set the hg user - echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc || die - # Set the bzr user - bzr whoami "Your Name <name@example.com>" || die - # command to run tests - distutils-r1_src_test -} |