commit: a9d2b117d709ea1e6e93d829e3376c1fbd518a9d
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 17:16:29 2023 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 20:17:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d2b117
dev-util/catkin: treeclean
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-util/catkin/Manifest | 1 -
dev-util/catkin/catkin-0.8.10.ebuild | 111 ---------------------
dev-util/catkin/catkin-9999.ebuild | 111 ---------------------
dev-util/catkin/files/40catkin | 3 -
dev-util/catkin/files/catkin_prefix_path.patch | 76 --------------
.../files/catkin_prefix_path_util_py_v2.patch | 40 --------
dev-util/catkin/files/distutils-v2.patch | 13 ---
dev-util/catkin/files/etc.patch | 16 ---
dev-util/catkin/files/gnuinstalldirs.patch | 15 ---
dev-util/catkin/files/gtest.patch | 45 ---------
dev-util/catkin/files/package_xml.patch | 37 -------
dev-util/catkin/files/tests.patch | 40 --------
dev-util/catkin/metadata.xml | 11 --
profiles/package.mask | 1 -
14 files changed, 520 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 ed9d9ab8fedf..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_{9..10} )
-
-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 ed9d9ab8fedf..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_{9..10} )
-
-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 <sean...@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 2de872ff3b48..000000000000
--- a/dev-util/catkin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>r...@gentoo.org</email>
- <name>Gentoo ROS Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">ros/catkin</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 7af0329dbf61..907b26ab7a47 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -372,7 +372,6 @@ dev-python/rosdistro
dev-python/rospkg
dev-python/urdf_parser_py
dev-python/vcstools
-dev-util/catkin
# Michał Górny <mgo...@gentoo.org> (2022-12-23)
# Packages that still use dev-python/nose and have no revdeps.
