gentoo auto-resync : 25:01:2023 - 08:07:03

author: V3n3RiX <venerix@koprulu.sector> 2023-01-25 08:07:03 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-25 08:07:03 +0000
commit: a1b20429e7e2ba1b44414459afd5a2b50788cd9c (patch)
tree: e721db30ecc3e534a03ab9b3115762959cc0c28c /dev-util
parent: dbbd2ae5e62a232616ede4dae3ed69e15903940a (diff)
40 files changed, 32 insertions, 1135 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4e953f337465..e75471e18c23 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
deleted file mode 100644
index 36ecd02576d8..000000000000
--- a/dev-util/catkin/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX 40catkin 89 BLAKE2B d8a24606f095c6afdbc9141a47fa250bd931b53f9e32ce885a7e1dee33013968e8e401404c187d8afb6660bbb3528888c43b46e473f5dd96b53cf9af04d24d42 SHA512 bc0fc727177f071c48b2177adceaa0f5578a55bb05a65035871d83c7b217d86ef7f6c8585264971d0c8957652a8a60dbdb674600087800433823190e577744db
-AUX catkin_prefix_path.patch 3297 BLAKE2B 60027c9564b6013f885bdd1f695e7279459cbf499536f381806116ef3d9d66a8507faa39008ee95d1d5662ec667dbe8ca3c1b284f0dd0fe561217a4876bfe960 SHA512 22c6e2440e1d7e48c46c0ad7f2006d621942b9c75d1d126ef1e110b36da321b79152aae8bf4d82c18250ce6da3337c697733ba130c1b2f116282ccb954d8d13f
-AUX catkin_prefix_path_util_py_v2.patch 2146 BLAKE2B 5ae8f277e150f02a79fc5d980c66376aa2212e668521644a07e7a6280184305de5430c1757ba251a10d0dcd58af69d0447cacbd114d8d44ce8b9ffd8fe3c6dbd SHA512 379e348d849633e0e18fc4de6a07c374725c90a5ac8bd3f96a85ba4f7add87c296e2bc8d8e3093ce994aebb49f9012a104993ab16b972db0d2239ce329780c94
-AUX distutils-v2.patch 795 BLAKE2B 830270d966c3006967424b94cd99d6a43803a85e8e68de4d609d60c68cbb610451b42a11d6906d944fb1f47ff669216f9f02e31f227b1379a6efb7b2e5e2f38d SHA512 c315382e77cbf3461e2a57ed6e3f270fe333396ebaff018a4177eb83ea9fd1565368ed51228686ba0ff6c2df6bed4eadece653664ff6bb7e32882eba6d3c3f7f
-AUX etc.patch 654 BLAKE2B 0ec3289f09983127f60ce4e1a93ad82b9c928fffe3dc820dc3ffc33c4cbedf794d3e49dbe646c83f884072ad949ebdbbe334cced9fdaa3448b5b219669019913 SHA512 8e6026dac6d79fc30056a7c598a99ca4cafcad442eec2eb2f48219b184d610e4d5da5faea5284dd078101b4ef761533d034aba49fd1af95f7f365887bbf22739
-AUX gnuinstalldirs.patch 714 BLAKE2B 32364640271a4868d5a92fcc9ca803df8067ecda2c89c69eb88c168bab4acc099ef2a7efd3c56a77e34acef2ad308780b69c66eb49c272e4d3b1b776d1b4c594 SHA512 38e6e0a220f20a7909a760b558997086bac9dc4919158d58dc41e5dd7d3bf22b8eb9a48cb05503c594dfa0a9e4bdb70e8eec121f45f777fc7821ec6e3678b600
-AUX gtest.patch 1676 BLAKE2B 2f53c95833d47d6637d4aecd07212e33be66e576ed2d869c221b77f0215f6d3879b85b4d70ed554febea86ab9c5246486dc21ed40b5796d081b271057e9cf0a7 SHA512 844e37fc82055eb5e22404b6786910043365a8425a3852e760e3122cc99716083a21155ab9a685d800b034fe34538849cd94740dc851f15e3bafa0773820912b
-AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee9c544a10fa4e61036ffb45a391f40eacd7f97ec92abf060a1afc790d87cc1cfa40ddc07561db14c027f SHA512 7d6e1cb0076681c6cbb1332b05e6cd33bae4f780939e00412fd4b022f71b0418a4ff4f8e13d06f42fd21225e78d058818d680fef691dad4412d75ea0f0ef9f5e
-AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
-DIST catkin-0.8.10.tar.gz 218095 BLAKE2B cac62d7682e14e258cb7b8a55ae93c8792dcdb38b281c68b8135adfe9225c07a0c6c16717426f9b12ccc6aba91178cf18eeb05a0474ee6524131970e0c158c92 SHA512 0bab7a7b13484b09d301af52f7e563b78d8b80ac5cfc36a36a725baea7f23bf374d4814303875a4a1aa3981e346a3e5fa3f9b1e27c3ae819102dbc239ca767b1
-EBUILD catkin-0.8.10.ebuild 2714 BLAKE2B d3523fd37b3910404271ed64c3bdaed0f56fac2d30d0003f080572f8224e8cfa008ecc24042353ff47549c4d9fad65f863bf972c6ef085c53d64303e20f60946 SHA512 7df07803fb3d870528c04953e436cd55f611794c12656c78afd2c1ad0de12fad5ad6b5d584a9465f4138de667324dbfe1fc597491a070349883ce59f857f7c75
-EBUILD catkin-9999.ebuild 2714 BLAKE2B d3523fd37b3910404271ed64c3bdaed0f56fac2d30d0003f080572f8224e8cfa008ecc24042353ff47549c4d9fad65f863bf972c6ef085c53d64303e20f60946 SHA512 7df07803fb3d870528c04953e436cd55f611794c12656c78afd2c1ad0de12fad5ad6b5d584a9465f4138de667324dbfe1fc597491a070349883ce59f857f7c75
-MISC metadata.xml 325 BLAKE2B 6b4fa2f717e83e9794eff42a1ce253023add1c910a29cb554c96f8b441aad0e43c90c19ab7adf0d474aa5eee0ba1fc33f3dee4b48f569ca5681a4cfba9173925 SHA512 1177255d031e77c588160d796868557c182cf59321345cf9e7252006221f9c2c6355a74bc4be375d1f4bb8897284bfe5851f947b4a2e3e0b3536d0753fbcdba3
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 <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 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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/catkin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index e21a28f5d005..ccf9053c2faa 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,10 +1,7 @@
 AUX 50poke-gentoo.el 334 BLAKE2B f5519ada4b710ea3c7aacdf716674b4a5d8b1af3d639b5de72f58cf974335ca49a27641c305c31fc34e07d88fedb959674d402355324b89fe955df73e418f302 SHA512 293ef7fbe66bbba71580173cebed9ba0bbe76f862e4ddc6ec78302724e7fc9eb159e40404bee46c32a30f472efeb7ed60d464b4324d0c8ca8cf147220a4d76ca
-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
-EBUILD poke-2.3.ebuild 919 BLAKE2B d5edcf4aca522c508b2f3b3116983dda26824b50d9390e498e37c3d67f43e9f5f62391501c0dd9b77769ed649d2e177e243f32067948751a8168b7dcf93ddeec SHA512 8c7a9c529e2f32b51c7cb79e2748abbd805420254f8f398a8cc7b35136b2a5a71a44ac40e04f869e97e58286815b6037bdcc94e51184625ee7773e895e515a14
-EBUILD poke-2.4-r1.ebuild 2432 BLAKE2B 2a0eb45d73af42774cd462895ab99c351a7d40137bbfb521a592ba85136ff5e7e0ecd880d33672f1ce36ede5100de3fd22c3ecb28ae8bd430723cc91b56dd48d SHA512 a47ed1fd936ec5face5a9f119dd158565c01f7f868ea4be9db045f72d9c1250a14100431ab5e94d8595752ef8b28037da42deba6a889c8437d320c3328cc92a7
-EBUILD poke-2.4.ebuild 1430 BLAKE2B f61f4eb13bf0f5d47e50c1c60df5d4f4548b3dff9ac719b4108ce9daa4dcae7f577128979ca3deff6c4c6502bbfbdf8a8d1130246c60dc7f164c50cf9da7b84e SHA512 81f235a365d29b1935bc3d34b21c57b999c757da0b5ab58786332cdae8ccdd0193cf5ddba8d3263290a63647b10fdfd4ac077e27a454cae9587c4d9219150bcf
-EBUILD poke-2.90.0.ebuild 2278 BLAKE2B 5b26043a486e84566833d240627a47436cd14d9f645b8b1e763379c72b7d530afa40fa31909deb479a978bbf36c94c0d9b170e2864bb6d987ea0ae2fa21d11e3 SHA512 9746e4f9841ce8e8cbeb6eef37456336d3c95beb95e2ac4404f40c7b8180a38b81d7351c68505523a2ea2b0e43a0e915701fbc97f6cb190d111540c78eb2b837
-EBUILD poke-9999.ebuild 2278 BLAKE2B 5b26043a486e84566833d240627a47436cd14d9f645b8b1e763379c72b7d530afa40fa31909deb479a978bbf36c94c0d9b170e2864bb6d987ea0ae2fa21d11e3 SHA512 9746e4f9841ce8e8cbeb6eef37456336d3c95beb95e2ac4404f40c7b8180a38b81d7351c68505523a2ea2b0e43a0e915701fbc97f6cb190d111540c78eb2b837
-MISC metadata.xml 623 BLAKE2B 51e59bebd2ed9b0bd17ec7e11081231742c058afe507ffccefd7b4209b44c9df071fa55df5f91f2a7fa8d15592cc6bb6b57f14f7d9f2c36a56c358f1f5f13bfe SHA512 7f571cd8cff23315c74ff749a6cec43cf5a97314159db15a9fd354c885fdb30db7f5c9b70beba56d9a6aa03141a2ffde8b3625406ae737d3688e0b5cb38d1ade
+DIST poke-2.90.1.tar.gz 7512925 BLAKE2B 38c9283f1c0b183b1b74c2ebd347edf6e9a9191d19070f7da32e6b0f520ec8197be3a813bc98160b47363cd11069bdaf84bb528498fe51cf2dcadf0bfa06a25e SHA512 f5823bed61ab64c2cdde83c918716fe64ad5552499023b2f5202130d6b2bab405c9d1cb1e12c7f190749689d86bf36f4edfe140ce748ac4c5f03d219197558d3
+EBUILD poke-2.4-r1.ebuild 2587 BLAKE2B 51d6c8738370b2a3b79c778d3be9c3c92bb7c3926c5d94a89fb9beeb77c381785b1ac8cf5b486bb4aa61f9f85a58a82f9d643d54e0023655a04a9554abc99ed0 SHA512 d99702f55c432319ae953dcb759aa103ac67153de07a216bf77fa7ccd595179230edb724f10e649a88e3f27d6e4da77a1214c6cba65d0ed5fa9c163be5505fc6
+EBUILD poke-2.90.1.ebuild 2285 BLAKE2B 01ed0496432709cece66fb8667146e65057c120120c6c4b43f674cd5aa3d765d088c2c0142cf9196a6ef901984a3637480ba2f61e4f0f36291684393d84d73e1 SHA512 0cc9cea5afea3dce7106a3a9c070befa92f9d94f94475909a3784d1c7f1bd275d8940828431c0eea6e15271e199253c610ed88ee837cbc40de47ef4cbdc45dee
+EBUILD poke-9999.ebuild 2440 BLAKE2B a80af75903ec4038786cf9f61b61614799c9802946dc1c9e0f415e9d0e0d550fecfc1f698e3c44af86da4faa84fe16171f5cfea82a622c1ab3634fc86747dba3 SHA512 b49bb765f70e5d722ffc848168a59a7fcfe8f5097bc0e3ed85e11f444247d90525d3fe626a6e76a247d6265fcd1f7609234de4181328d94aadb14e2836990acb
+MISC metadata.xml 514 BLAKE2B 5df1664ca8693598aba1a31675859940052e5e3aa6f5b045036e0da3a47a26ed601f6241977c8a1e611a096798f6d219e6818ce2963f88a4d5e4f6595495e877 SHA512 3e60b71e68d20a2b8c6ee0a5133b41a4beccf942a9c52739dbf7f11c998851411464d2882b0d2b2aab96ea00b9994d3dc73b2d68afcf874af1e561efaa97caf2
diff --git a/dev-util/poke/metadata.xml b/dev-util/poke/metadata.xml
index 11ba06c9a172..bf6a99e942a5 100644
--- a/dev-util/poke/metadata.xml
+++ b/dev-util/poke/metadata.xml
@@ -6,7 +6,6 @@
     <name>Arsen Arsenović</name>
   </maintainer>
   <use>
-    <flag name="machine-interface">Enable machine-interface protocol using <pkg>dev-libs/json-c</pkg></flag>
     <flag name="pvm-profiling">Enable profiling in the PVM</flag>
     <flag name="nbd">Enable poking at networked block devices via <pkg>sys-libs/libnbd</pkg>.</flag>
   </use>
diff --git a/dev-util/poke/poke-2.3.ebuild b/dev-util/poke/poke-2.3.ebuild
deleted file mode 100644
index 239b69e1ccb0..000000000000
--- a/dev-util/poke/poke-2.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="https://www.jemarch.net/poke"
-SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="machine-interface nls test"
-
-RESTRICT="!test? ( test )"
-
-# TODO: libnbd: not packaged in gentoo yet
-# TODO: gui: does not seem to do anything :)
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-	machine-interface? ( dev-libs/json-c:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-BDEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-gui \
-		--disable-libnbd \
-		$(use_enable machine-interface mi) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/poke/poke-2.4-r1.ebuild b/dev-util/poke/poke-2.4-r1.ebuild
index 4f71cf92ec9f..b64df1c180ef 100644
--- a/dev-util/poke/poke-2.4-r1.ebuild
+++ b/dev-util/poke/poke-2.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit elisp-common flag-o-matic
+inherit elisp-common flag-o-matic toolchain-funcs
 
 DESCRIPTION="Extensible editor for structured binary data"
 HOMEPAGE="https://www.jemarch.net/poke"
@@ -47,6 +47,7 @@ DEPEND="
 BDEPEND="
 	${REGEN_BDEPEND}
 	virtual/pkgconfig
+	pvm-profiling? ( sys-devel/gcc )
 	emacs? ( >=app-editors/emacs-23.1:* )
 	test? (
 		dev-util/dejagnu
@@ -56,6 +57,12 @@ BDEPEND="
 
 SITEFILE="50${PN}-gentoo.el"
 
+pkg_pretend() {
+	if use pvm-profiling && ! tc-is-gcc; then
+		die "USE=pvm-profiling requires GCC"
+	fi
+}
+
 pkg_setup() {
 	use emacs && elisp-check-emacs-version
 }
diff --git a/dev-util/poke/poke-2.4.ebuild b/dev-util/poke/poke-2.4.ebuild
deleted file mode 100644
index 88d5da88915a..000000000000
--- a/dev-util/poke/poke-2.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="https://www.jemarch.net/poke"
-SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pvm-profiling nls test"
-
-RESTRICT="!test? ( test )"
-
-# TODO: libnbd: not packaged in gentoo yet
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-BDEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-src_configure() {
-	# See bug 858461.
-	# Upstream support might happen one day.  For context, only one file needs
-	# LTO to be disabled (since it's an autogenerated bytecode interpreter),
-	# others do not.  The build system will handle this at some point in the
-	# future.  Until then, just filter out LTO.
-	filter-lto
-
-	# NB --disable-{gui,mi}:
-	# These (AFAICT) have no consumers in Gentoo, and should not get any,
-	# preferably. They are slated for removal with Poke 3 (should happen
-	# towards the end of the year, possibly), so they should not be relied
-	# upon.
-	econf \
-		--disable-libnbd \
-		--enable-hserver \
-		--disable-gui \
-		--disable-mi \
-		$(use_enable pvm-profiling) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
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..80e149428e9b 100644
--- a/dev-util/poke/poke-9999.ebuild
+++ b/dev-util/poke/poke-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit elisp-common flag-o-matic
+inherit elisp-common flag-o-matic toolchain-funcs
 
 DESCRIPTION="Extensible editor for structured binary data"
 HOMEPAGE="https://www.jemarch.net/poke"
@@ -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
@@ -50,6 +50,7 @@ DEPEND="
 BDEPEND="
 	${REGEN_BDEPEND}
 	virtual/pkgconfig
+	pvm-profiling? ( sys-devel/gcc )
 	emacs? ( >=app-editors/emacs-23.1:* )
 	test? (
 		dev-util/dejagnu
@@ -59,6 +60,12 @@ BDEPEND="
 
 SITEFILE="50${PN}-gentoo.el"
 
+pkg_pretend() {
+	if use pvm-profiling && ! tc-is-gcc; then
+		die "USE=pvm-profiling requires GCC"
+	fi
+}
+
 pkg_setup() {
 	use emacs && elisp-check-emacs-version
 }
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
deleted file mode 100644
index 6bb2e3ee974e..000000000000
--- a/dev-util/rosdep/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX tests.patch 886 BLAKE2B e631053ce6ecd6419cf88ca952d28a225229d248f52f6f600bb9865cf9760dea01e4039401b5039330aa6776ae18e1fe0159c725ee5f1bebcc1fd73248d37209 SHA512 87f7ca16f7b7f781ac5a2173ee4a9a6ed1baa2d9583d740d0cd46590d41a5781395fc5fbba185a20cac5cae0a1f967abfc205a67bce3487c0f82b04b0c08600b
-DIST rosdep-0.21.0.tar.gz 312028 BLAKE2B 7ad3bfe027c574fdc82952085a5ea447e811b6858fca13121ad25cf1bda04e33091782b69c4a8f9a71383f1716678bd19c8752600987f7c41016ee93eed1ddcb SHA512 fb784c1603087b62444d767f1ce9e45303d2161e69ac82fec0edeeefd99f0c70e14b25b64a516df01e72aaa3a1b4a25b9507855edaa169c3af945e6581d9751d
-DIST rosdep-0.22.1.tar.gz 313822 BLAKE2B 537756d107e0cdea2333743bf387cfacde295a1cd368d212800fcfc9a967861b5ecd0a30e9ad53870fce7ea69d604650bb74d7331b3eb46adacffe9c2b8a0b57 SHA512 62964b2ca876cdf0cb392ba7b15a0bc5f5a735469fa9abfd0a0b0117a99fa47d5f8b7a415d9d0b7ebce1d399a964b6ee12d46c2ace8ff856cb17f2153f5cabd3
-EBUILD rosdep-0.21.0.ebuild 1463 BLAKE2B 6f6a344b06d518c0f6f4a38450375dddaf30977c6c80ce7de511e105026226115671e514b36dea50ab2d9383d8d5bb4424bc9244f0e24eedfaf21b199fc33b58 SHA512 b57eda888187955d0632080df49445099b5c77c855f7e071c87be63e0ff6a99c5871b5200bef6e3e354cb73d350ab4d96b33abb1f3255847cbf5c0c54c71b9dd
-EBUILD rosdep-0.22.1.ebuild 1418 BLAKE2B 13e18243dd24797db8dd560893cdb3d54aa26c4f8bf92c51739486b7a2b6ca8a2d37126af66085a5070d2f72338236f1993b358ccc4590729201a6acad187343 SHA512 5e4f43f072415c3c9ac5cd765b70e454864eedcfa3820dcae74e146305b78f26254ce6fbdef7ebe9a67c410d6a2668fc0481e1d8669ebfb0f1302c18d7ab5229
-EBUILD rosdep-9999.ebuild 1418 BLAKE2B 13e18243dd24797db8dd560893cdb3d54aa26c4f8bf92c51739486b7a2b6ca8a2d37126af66085a5070d2f72338236f1993b358ccc4590729201a6acad187343 SHA512 5e4f43f072415c3c9ac5cd765b70e454864eedcfa3820dcae74e146305b78f26254ce6fbdef7ebe9a67c410d6a2668fc0481e1d8669ebfb0f1302c18d7ab5229
-MISC metadata.xml 340 BLAKE2B 3b83bd82370daae07a101ac040bb7726d8d79354d7f249a9e09081e1f2042bac1fd8cfbc51f7c2c186e2499962749ad579a2fbef65f2d80dc9f4de620904d976 SHA512 38588868dee16a28125f625e85606a6e0995a6e25cf7c17de373eb45a6ad72e56bc2e98cdd946457aaba53f394ed045cb69891a77796aa0f1c3f2e24e6ab9b56
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 7a02b5d1bb38..000000000000
--- a/dev-util/rosdep/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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-infrastructure/rosdep</remote-id>
-	</upstream>
-</pkgmetadata>
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 8bfe26713410..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_{9..10} )
-
-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 03bbe03b5ab9..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_{9..10} )
-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 03bbe03b5ab9..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_{9..10} )
-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 87db319a06a6..000000000000
--- a/dev-util/rosinstall/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rosinstall-0.7.8.tar.gz 26430 BLAKE2B fae82276f5376a94914272e60b2e3b0f81cb37bd7b41e0a4df73c8b58d19a73505a0c5e193495fd59c931c04265cbb372abfad19fd4043fc77e5224127bd97f5 SHA512 a53ae8fb96f9dda4671b22dfd9dbadc18d1e4adbf34a50b6706baf971c1c7ee418e14641d334346b02638f06c10d1bc984b4759c92a39510dd0044fbc346be67
-EBUILD rosinstall-0.7.8.ebuild 1490 BLAKE2B db7c9620a7503408cd2f4aff1746b8fa5e301bed98193db16f2cf54567d089a3ceb366e8738f4a802c72d627570a3264002ae06f730f5df5ab2341101a98fab5 SHA512 f162624bd9489717c2bc62952b798d9bd7387fda6f7337974257739190e8ae3d934a9a940f66f5445d1cb4ea175d815259dcfb12ac1897acb2328b17d5c8bafb
-EBUILD rosinstall-9999.ebuild 1490 BLAKE2B db7c9620a7503408cd2f4aff1746b8fa5e301bed98193db16f2cf54567d089a3ceb366e8738f4a802c72d627570a3264002ae06f730f5df5ab2341101a98fab5 SHA512 f162624bd9489717c2bc62952b798d9bd7387fda6f7337974257739190e8ae3d934a9a940f66f5445d1cb4ea175d815259dcfb12ac1897acb2328b17d5c8bafb
-MISC metadata.xml 334 BLAKE2B 122018b9b2cb34c070abad5e4f6ba6400f240279013fd76f711d5aad1a7cc29e7d811ddf667046ebf46d997d2786deb2fead1f5249a81ea14191e26a9e420a54 SHA512 3bdac7021be057bbf3491275f84095cc315353ca802befc35440971834346d7f3f7957ba143493b04ca5571e7bb6fe65c79644bb0ace6937cc40fa6f00a6ae26
diff --git a/dev-util/rosinstall/metadata.xml b/dev-util/rosinstall/metadata.xml
deleted file mode 100644
index e2144bf21b12..000000000000
--- a/dev-util/rosinstall/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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">vcstools/rosinstall</remote-id>
-	</upstream>
-</pkgmetadata>
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 fd15922f5da2..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_{9..10} )
-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 fd15922f5da2..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_{9..10} )
-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/valgrind/Manifest b/dev-util/valgrind/Manifest
index bfdd500d5735..3d2de0a5e90e 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -8,8 +8,8 @@ AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2
 DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a33a083505b42adaa94ee3af659cbe073e516bc98163ef56233e6cd9de2125839b71ee443fbc0db6557dcb35a6c05280 SHA512 f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2
 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
 DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7 SHA512 70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d
-EBUILD valgrind-3.19.0.ebuild 3958 BLAKE2B 993c8677d095cfeb55bb22c3db5f46161b3b615e5559f4b2bf613bb8596fa8c2e4116ef9b0ba4aba8a8ef6dd2ca8a9da82e6b7a73c5061767707444a672b224d SHA512 8af1c7c7cd56ad77d7f81aac35d234b999b502f7288e7881431b8e6c8a7c9c46cecb0f3f1075b879b02aa6c8314540dd90c377366d08f78b1845d04cd71c85b1
-EBUILD valgrind-3.20.0-r2.ebuild 4325 BLAKE2B 0e9c49e05cdb3a72f662df72ab1f00e8e06d7a6b255a588850e4a87b6d63032482a523d962bb2d77b29e5f763b6559012b3bc58b8a466bc3b70f20000daaba32 SHA512 1f9cd9477894f50786f8fe9ed0b586f5ba604909f3a73231251f67127af6c223c2fa6b297bb2fc68139631ff44f080296751d9bef9e2ded27b597803d6eead1c
-EBUILD valgrind-3.20.0.ebuild 3956 BLAKE2B 2482b90a5b52a6e92e10dd6616c8355de8807ebfbff1377e8c8378dbf7ff9dc24a1d556d900d5bb19a35714c36e6aa85559b5c81f41e0f4df1dd8a631e7112ae SHA512 ffb496cda3673082efe0f6f02c65ee8cba47d4d65f742b579234c810671a2118e6e8dee59791675f1c12e41307d72f816714676280324e4f5db5501673f97bdf
-EBUILD valgrind-9999.ebuild 4234 BLAKE2B 7537207850387161db02f37f5bb8f5d3157d93707376047be73776e4c6c83804c735b5c7d1e240fe9d440d3cc0e47441e5a93a28fecf49351da35569c76b5522 SHA512 c02c60191fc56259d82fa90fc8918164de65c49ed596e5135fc65678f0f15f355232d1f0509077c7b552c8100fead2d3809276592345797b8ffe104fe336d952
+EBUILD valgrind-3.19.0.ebuild 3954 BLAKE2B d8d02f214a8c371c7636d9c39ad30e341926028cc77d983f7c99d576a47904499522808c70b03c374b98a19c0df9e4965e60594a52d61b17c01efd35f192df75 SHA512 ce5e9ae78091d0437149aabfe690f3ecd15c18f78318133c08256625846d20e577ba6ed68f5f2773e2bba8cb70e1674e4e22051abb1466d47116d674189da032
+EBUILD valgrind-3.20.0-r2.ebuild 4321 BLAKE2B 4637a8f0c0ce87bdcf4a737c3cd22c1baaaa3734d394043a562aa168d1c8b79d5c7d57fc3179c739c517b4cfcca82169490621e9214ca0fe4df8405524721bac SHA512 70883c072b620a776e3e598751cb770621c00ccf9ad8a317e597eace07077e7e622aa33a3178ee3773e73b36dde3cd878f10ca289beabed6cfdd508b84ae5cad
+EBUILD valgrind-3.20.0.ebuild 3952 BLAKE2B d60d14a52fd07b3deef8cfb9b909919bc4d495b5adacbaf676f6ff31f847ca1389e1b7b9cc1735dc2a54386e592bc90f60edadc61953302db616bb459913ba9b SHA512 71e4d9fe16ebee33d03e10c2933cf9a3ce4a49178560ae4e2a252d49df526ebf9fadb6477331e1e104f4b77e2fef5b3b862fe376f804f401f75253180701da5d
+EBUILD valgrind-9999.ebuild 4230 BLAKE2B e371ed0bfedc19162d814b3939e270405ccc68b49f59e40d92e237d692cfaa2f2fded8d3985887150da212d7f8594453eee70b861b1c057a242550d62903a2e8 SHA512 4d49d8ae018ddc0c0cfab9d30a135554eb31f59f01c4aa0b3b344fd02fae9f9b1cd5576ffdfe084ba894d2ee9c5842f8d5c7b821d093833458914b030712eb07
 MISC metadata.xml 1150 BLAKE2B 05b2508ff61ac0659472f75ab074a5f0cc82a3ead6e9bd6e779984bf11c8257afcadd5734b0c34defa5739f1eb0dadeb2168a448c0482848d8d7bf8b598d5dff SHA512 80841b7058fee9293b9bddeb4ed2b1d2b53b4957d43973d9d748e9797c5a5a4b50f7377d9e6bdf31cc1a0c87702327e02568a15e3e354f1fa6cf280eb439b317
diff --git a/dev-util/valgrind/valgrind-3.19.0.ebuild b/dev-util/valgrind/valgrind-3.19.0.ebuild
index 949500bb17c8..f7e812e805cc 100644
--- a/dev-util/valgrind/valgrind-3.19.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.19.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="https://www.valgrind.org"
+HOMEPAGE="https://valgrind.org"
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
diff --git a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
index b9e8b41d028b..380fc17ef55f 100644
--- a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="https://www.valgrind.org"
+HOMEPAGE="https://valgrind.org"
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
diff --git a/dev-util/valgrind/valgrind-3.20.0.ebuild b/dev-util/valgrind/valgrind-3.20.0.ebuild
index bf165cdd0c9a..5d8a7a3727cd 100644
--- a/dev-util/valgrind/valgrind-3.20.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="https://www.valgrind.org"
+HOMEPAGE="https://valgrind.org"
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 8821f6a258ed..1dc6424e705b 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="https://www.valgrind.org"
+HOMEPAGE="https://valgrind.org"
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
deleted file mode 100644
index 4b2dd2fbf3db..000000000000
--- a/dev-util/wstool/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST wstool-0.1.18.tar.gz 80595 BLAKE2B ed90fc5c63ab5d775dfb49ddacc6da6e285aeb5078cf471c0d504659a9e322fde27797e4d05fd56dff4b9958558200cf05e46cf7ae71fd1231ab63048e668808 SHA512 fda9c679183c605048ed024a57b07fd2d9b644978a3e4ff89c3716b74d8e4ba0124779bcdf88a75fdbbf47c765b7ab63db7c84a55a6e1744fc6f955649590c48
-EBUILD wstool-0.1.18.ebuild 1256 BLAKE2B c586ee349d55f49cbd2f0053a84b26ef6e8d26e28ae4617cbd0fa82a3bd3ea4027bb293ce200e3fc0cc8f8c5a4efe177731267bbb2539f4346fb598a3a37024e SHA512 738c20c41ff50f6afd329a6e989c140a57d407e59f907a7a31d9fbe722f1bae70bbb44d3cc3db6c031fbe24cc1716460bb331bffbe738ddc432eca4b410a8e3e
-EBUILD wstool-9999.ebuild 1256 BLAKE2B c586ee349d55f49cbd2f0053a84b26ef6e8d26e28ae4617cbd0fa82a3bd3ea4027bb293ce200e3fc0cc8f8c5a4efe177731267bbb2539f4346fb598a3a37024e SHA512 738c20c41ff50f6afd329a6e989c140a57d407e59f907a7a31d9fbe722f1bae70bbb44d3cc3db6c031fbe24cc1716460bb331bffbe738ddc432eca4b410a8e3e
-MISC metadata.xml 330 BLAKE2B 621e47f88d4d67ce9b72775dac0e6066b1f56e0683585e72f70a820ed655c80d76fa4c451e9a5ca179d176c8fb9ab29a4949c26c2cfbf97ef31e4c767c8960ff SHA512 fef9cedb34e14f5fdbbc9e244d01c82f953fea9b299512352c11d9315d1748b8ffb63469caf1e00a0122b70f8376593e6a58ab20928865f35a57f511eb903634
diff --git a/dev-util/wstool/metadata.xml b/dev-util/wstool/metadata.xml
deleted file mode 100644
index bcda1e62d35a..000000000000
--- a/dev-util/wstool/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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">vcstools/wstool</remote-id>
-	</upstream>
-</pkgmetadata>
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 3379e43b54b4..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_{9..10} )
-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 3379e43b54b4..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_{9..10} )
-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
-}
author	V3n3RiX <venerix@koprulu.sector>	2023-01-25 08:07:03 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-25 08:07:03 +0000
commit	a1b20429e7e2ba1b44414459afd5a2b50788cd9c (patch)
tree	e721db30ecc3e534a03ab9b3115762959cc0c28c /dev-util
parent	dbbd2ae5e62a232616ede4dae3ed69e15903940a (diff)