4 files changed, 444 insertions, 2 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 26e87ead8496..d6ba3e97aa58 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index c315e724d1fe..ab7126c99388 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,449 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2022-12-24)
+# RobotOS is suffering from serious lack of manpower in Gentoo.
+# While the packages are being bumped, the bugs reported against them
+# are not being addressed.  Whenever tests are present, they are often
+# failing and/or still relying on dead dev-python/nose.  Python 3.11
+# support is blocked, and 3.10 barely managed.
+# Removal on 2023-01-23.  Bug #888167.
+acct-group/ros
+acct-user/ros
+dev-python/ament_package
+dev-python/catkin_pkg
+dev-python/osrf_pycommon
+dev-python/python_orocos_kdl
+dev-python/rosdistro
+dev-python/rospkg
+dev-python/urdf_parser_py
+dev-python/vcstools
+dev-ros/actionlib
+dev-ros/actionlib_msgs
+dev-ros/actionlib_tools
+dev-ros/actionlib_tutorials
+dev-ros/amcl
+dev-ros/ament_cmake_copyright
+dev-ros/ament_cmake_core
+dev-ros/ament_cmake_cppcheck
+dev-ros/ament_cmake_cpplint
+dev-ros/ament_cmake_export_definitions
+dev-ros/ament_cmake_export_dependencies
+dev-ros/ament_cmake_export_include_directories
+dev-ros/ament_cmake_export_interfaces
+dev-ros/ament_cmake_export_libraries
+dev-ros/ament_cmake_export_link_flags
+dev-ros/ament_cmake_export_targets
+dev-ros/ament_cmake_gen_version_h
+dev-ros/ament_cmake_gmock
+dev-ros/ament_cmake_gtest
+dev-ros/ament_cmake_include_directories
+dev-ros/ament_cmake_libraries
+dev-ros/ament_cmake_lint_cmake
+dev-ros/ament_cmake_pytest
+dev-ros/ament_cmake_python
+dev-ros/ament_cmake_ros
+dev-ros/ament_cmake_target_dependencies
+dev-ros/ament_cmake_test
+dev-ros/ament_cmake_uncrustify
+dev-ros/ament_cmake_version
+dev-ros/ament_cmake_xmllint
+dev-ros/ament_copyright
+dev-ros/ament_cppcheck
+dev-ros/ament_cpplint
+dev-ros/ament_flake8
+dev-ros/ament_lint
+dev-ros/ament_lint_auto
+dev-ros/ament_lint_cmake
+dev-ros/ament_pep257
+dev-ros/ament_uncrustify
+dev-ros/ament_xmllint
+dev-ros/angles
+dev-ros/audio_capture
+dev-ros/audio_common_msgs
+dev-ros/audio_play
+dev-ros/base_local_planner
+dev-ros/bond
+dev-ros/bondcpp
+dev-ros/bondpy
+dev-ros/calibration_estimation
+dev-ros/calibration_launch
+dev-ros/calibration_msgs
+dev-ros/calibration_setup_helper
+dev-ros/camera_calibration
+dev-ros/camera_calibration_parsers
+dev-ros/camera_info_manager
+dev-ros/carrot_planner
+dev-ros/class_loader
+dev-ros/clear_costmap_recovery
+dev-ros/cmake_modules
+dev-ros/collada_parser
+dev-ros/collada_urdf
+dev-ros/combined_robot_hw
+dev-ros/combined_robot_hw_tests
+dev-ros/compressed_depth_image_transport
+dev-ros/compressed_image_transport
+dev-ros/console_bridge_vendor
+dev-ros/controller_interface
+dev-ros/controller_manager
+dev-ros/controller_manager_msgs
+dev-ros/controller_manager_tests
+dev-ros/control_msgs
+dev-ros/control_toolbox
+dev-ros/convex_decomposition
+dev-ros/costmap_2d
+dev-ros/cpp_common
+dev-ros/cv_bridge
+dev-ros/depth_image_proc
+dev-ros/depthimage_to_laserscan
+dev-ros/diagnostic_aggregator
+dev-ros/diagnostic_analysis
+dev-ros/diagnostic_common_diagnostics
+dev-ros/diagnostic_msgs
+dev-ros/diagnostic_updater
+dev-ros/driver_base
+dev-ros/dwa_local_planner
+dev-ros/dynamic_reconfigure
+dev-ros/eigen_conversions
+dev-ros/eigen_stl_containers
+dev-ros/fake_localization
+dev-ros/filters
+dev-ros/gazebo_dev
+dev-ros/gazebo_msgs
+dev-ros/gazebo_plugins
+dev-ros/gazebo_ros
+dev-ros/gazebo_ros_control
+dev-ros/gencpp
+dev-ros/geneus
+dev-ros/genlisp
+dev-ros/genmsg
+dev-ros/gennodejs
+dev-ros/genpy
+dev-ros/geodesy
+dev-ros/geographic_msgs
+dev-ros/geometric_shapes
+dev-ros/geometry_msgs
+dev-ros/global_planner
+dev-ros/gmapping
+dev-ros/hardware_interface
+dev-ros/hector_compressed_map_transport
+dev-ros/hector_geotiff
+dev-ros/hector_geotiff_launch
+dev-ros/hector_geotiff_plugins
+dev-ros/hector_imu_attitude_to_tf
+dev-ros/hector_imu_tools
+dev-ros/hector_mapping
+dev-ros/hector_map_server
+dev-ros/hector_map_tools
+dev-ros/hector_marker_drawing
+dev-ros/hector_nav_msgs
+dev-ros/hector_pose_estimation
+dev-ros/hector_pose_estimation_core
+dev-ros/hector_slam_launch
+dev-ros/hector_trajectory_server
+dev-ros/image_cb_detector
+dev-ros/image_geometry
+dev-ros/image_proc
+dev-ros/image_publisher
+dev-ros/image_rotate
+dev-ros/image_transport
+dev-ros/image_view
+dev-ros/imu_complementary_filter
+dev-ros/imu_filter_madgwick
+dev-ros/imu_processors
+dev-ros/imu_transformer
+dev-ros/interactive_markers
+dev-ros/interactive_marker_tutorials
+dev-ros/interval_intersection
+dev-ros/ivcon
+dev-ros/joint_limits_interface
+dev-ros/joint_state_publisher
+dev-ros/joint_state_publisher_gui
+dev-ros/joint_states_settler
+dev-ros/kdl_conversions
+dev-ros/kdl_parser
+dev-ros/kdl_parser_py
+dev-ros/laser_assembler
+dev-ros/laser_cb_detector
+dev-ros/laser_filters
+dev-ros/laser_geometry
+dev-ros/laser_proc
+dev-ros/libmavconn
+dev-ros/librviz_tutorial
+dev-ros/map_msgs
+dev-ros/map_server
+dev-ros/mavlink-gbp-release
+dev-ros/mavros
+dev-ros/mavros_extras
+dev-ros/mavros_msgs
+dev-ros/media_export
+dev-ros/message_filters
+dev-ros/message_generation
+dev-ros/message_runtime
+dev-ros/message_to_tf
+dev-ros/mk
+dev-ros/monocam_settler
+dev-ros/move_base
+dev-ros/move_base_msgs
+dev-ros/moveit_msgs
+dev-ros/move_slow_and_clear
+dev-ros/nav_core
+dev-ros/navfn
+dev-ros/nav_msgs
+dev-ros/nmea_msgs
+dev-ros/nodelet
+dev-ros/nodelet_topic_tools
+dev-ros/nodelet_tutorial_math
+dev-ros/object_recognition_msgs
+dev-ros/octomap_msgs
+dev-ros/octomap_ros
+dev-ros/opencv_apps
+dev-ros/opencv_tests
+dev-ros/openni2_camera
+dev-ros/openni2_launch
+dev-ros/openslam_gmapping
+dev-ros/pcl_conversions
+dev-ros/pcl_msgs
+dev-ros/pcl_ros
+dev-ros/pluginlib
+dev-ros/pluginlib_tutorials
+dev-ros/poco_vendor
+dev-ros/pointcloud_to_laserscan
+dev-ros/polled_camera
+dev-ros/pr2_dashboard_aggregator
+dev-ros/pr2_description
+dev-ros/pr2_machine
+dev-ros/pr2_msgs
+dev-ros/python_cmake_module
+dev-ros/python_qt_binding
+dev-ros/qt_dotgraph
+dev-ros/qt_gui
+dev-ros/qt_gui_app
+dev-ros/qt_gui_cpp
+dev-ros/qt_gui_py_common
+dev-ros/random_numbers
+dev-ros/realtime_tools
+dev-ros/resource_retriever
+dev-ros/rgbd_launch
+dev-ros/robot_localization
+dev-ros/robot_pose_ekf
+dev-ros/robot_pose_publisher
+dev-ros/robot_state_publisher
+dev-ros/rosapi
+dev-ros/rosauth
+dev-ros/rosbag
+dev-ros/rosbag_migration_rule
+dev-ros/rosbag_storage
+dev-ros/rosbash
+dev-ros/rosboost_cfg
+dev-ros/rosbridge_library
+dev-ros/rosbridge_msgs
+dev-ros/rosbridge_server
+dev-ros/rosbuild
+dev-ros/rosclean
+dev-ros/rosconsole
+dev-ros/rosconsole_bridge
+dev-ros/roscpp
+dev-ros/roscpp_serialization
+dev-ros/roscpp_traits
+dev-ros/roscpp_tutorials
+dev-ros/roscreate
+dev-ros/rosdiagnostic
+dev-ros/ros_environment
+dev-ros/rosgraph
+dev-ros/rosgraph_msgs
+dev-ros/roslang
+dev-ros/roslaunch
+dev-ros/roslib
+dev-ros/roslint
+dev-ros/roslisp
+dev-ros/roslz4
+dev-ros/rosmake
+dev-ros/rosmaster
+dev-ros/rosmsg
+dev-ros/rosnode
+dev-ros/rosout
+dev-ros/rospack
+dev-ros/rosparam
+dev-ros/rospy
+dev-ros/rospy_tutorials
+dev-ros/rosserial_arduino
+dev-ros/rosserial_client
+dev-ros/rosserial_embeddedlinux
+dev-ros/rosserial_msgs
+dev-ros/rosserial_python
+dev-ros/rosserial_server
+dev-ros/rosserial_tivac
+dev-ros/rosserial_windows
+dev-ros/rosserial_xbee
+dev-ros/rosservice
+dev-ros/rostest
+dev-ros/rostime
+dev-ros/rostopic
+dev-ros/rosunit
+dev-ros/roswtf
+dev-ros/rotate_recovery
+dev-ros/rqt_action
+dev-ros/rqt_bag
+dev-ros/rqt_bag_plugins
+dev-ros/rqt_console
+dev-ros/rqt_controller_manager
+dev-ros/rqt_dep
+dev-ros/rqt_graph
+dev-ros/rqt_gui
+dev-ros/rqt_gui_cpp
+dev-ros/rqt_gui_py
+dev-ros/rqt_image_view
+dev-ros/rqt_launch
+dev-ros/rqt_logger_level
+dev-ros/rqt_moveit
+dev-ros/rqt_msg
+dev-ros/rqt_nav_view
+dev-ros/rqt_plot
+dev-ros/rqt_pose_view
+dev-ros/rqt_publisher
+dev-ros/rqt_py_common
+dev-ros/rqt_py_console
+dev-ros/rqt_reconfigure
+dev-ros/rqt_robot_dashboard
+dev-ros/rqt_robot_monitor
+dev-ros/rqt_robot_steering
+dev-ros/rqt_runtime_monitor
+dev-ros/rqt_rviz
+dev-ros/rqt_service_caller
+dev-ros/rqt_shell
+dev-ros/rqt_srv
+dev-ros/rqt_tf_tree
+dev-ros/rqt_top
+dev-ros/rqt_topic
+dev-ros/rqt_web
+dev-ros/rviz
+dev-ros/rviz_imu_plugin
+dev-ros/rviz_plugin_tutorials
+dev-ros/rviz_python_tutorial
+dev-ros/self_test
+dev-ros/sensor_msgs
+dev-ros/settlerlib
+dev-ros/shape_msgs
+dev-ros/smach
+dev-ros/smach_msgs
+dev-ros/smach_ros
+dev-ros/smclib
+dev-ros/stage_ros
+dev-ros/std_msgs
+dev-ros/std_srvs
+dev-ros/stereo_image_proc
+dev-ros/stereo_msgs
+dev-ros/test_bond
+dev-ros/test_diagnostic_aggregator
+dev-ros/test_nodelet
+dev-ros/test_nodelet_topic_tools
+dev-ros/test_rosbag
+dev-ros/test_rosbag_storage
+dev-ros/test_roscpp
+dev-ros/test_rosgraph
+dev-ros/test_roslaunch
+dev-ros/test_roslib_comm
+dev-ros/test_rosmaster
+dev-ros/test_rosparam
+dev-ros/test_rospy
+dev-ros/test_rosservice
+dev-ros/test_tf2
+dev-ros/tf
+dev-ros/tf2
+dev-ros/tf2_bullet
+dev-ros/tf2_eigen
+dev-ros/tf2_geometry_msgs
+dev-ros/tf2_kdl
+dev-ros/tf2_msgs
+dev-ros/tf2_py
+dev-ros/tf2_ros
+dev-ros/tf2_sensor_msgs
+dev-ros/tf2_tools
+dev-ros/tf_conversions
+dev-ros/theora_image_transport
+dev-ros/timestamp_tools
+dev-ros/topic_tools
+dev-ros/trajectory_msgs
+dev-ros/transmission_interface
+dev-ros/turtle_actionlib
+dev-ros/turtlesim
+dev-ros/turtle_tf
+dev-ros/turtle_tf2
+dev-ros/unique_id
+dev-ros/urdf
+dev-ros/urdf_parser_plugin
+dev-ros/urdf_tutorial
+dev-ros/urg_c
+dev-ros/urg_node
+dev-ros/uuid_msgs
+dev-ros/visp_auto_tracker
+dev-ros/visp_bridge
+dev-ros/visp_camera_calibration
+dev-ros/visp_hand2eye_calibration
+dev-ros/visp_tracker
+dev-ros/visualization_marker_tutorials
+dev-ros/visualization_msgs
+dev-ros/voxel_grid
+dev-ros/xacro
+dev-ros/xmlrpcpp
+dev-util/catkin
+dev-util/rosdep
+dev-util/rosinstall
+dev-util/wstool
+ros-meta/ament_cmake
+ros-meta/audio_common
+ros-meta/bond_core
+ros-meta/calibration
+ros-meta/common_msgs
+ros-meta/common_tutorials
+ros-meta/desktop
+ros-meta/desktop_full
+ros-meta/diagnostics
+ros-meta/driver_common
+ros-meta/executive_smach
+ros-meta/gazebo_ros_pkgs
+ros-meta/geographic_info
+ros-meta/geometry
+ros-meta/geometry2
+ros-meta/geometry_tutorials
+ros-meta/hector_localization
+ros-meta/hector_slam
+ros-meta/image_common
+ros-meta/image_pipeline
+ros-meta/image_transport_plugins
+ros-meta/imu_pipeline
+ros-meta/imu_tools
+ros-meta/laser_pipeline
+ros-meta/mavros
+ros-meta/navigation
+ros-meta/nodelet_core
+ros-meta/perception
+ros-meta/perception_pcl
+ros-meta/pr2_common
+ros-meta/qt_gui_core
+ros-meta/robot
+ros-meta/robot_model
+ros-meta/ros
+ros-meta/ros_base
+ros-meta/rosbridge_suite
+ros-meta/ros_comm
+ros-meta/ros_control
+ros-meta/ros_core
+ros-meta/roscpp_core
+ros-meta/rosserial
+ros-meta/ros_tutorials
+ros-meta/rqt
+ros-meta/rqt_common_plugins
+ros-meta/rqt_robot_plugins
+ros-meta/simulators
+ros-meta/slam_gmapping
+ros-meta/unique_identifier
+ros-meta/vision_opencv
+ros-meta/vision_visp
+ros-meta/visualization_tutorials
+ros-meta/viz
+
 # Michał Górny <mgorny@gentoo.org> (2022-12-23)
 # Does not build against current MySQL libraries.  Last release in 2012.
 # No reverse dependencies.
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 18b1903bedde..dc5c327c5b70 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 68889fb030cd..cd464e268b5e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3749,7 +3749,6 @@ mail-filter/pyzor:mysql - Enables the MySQL back-end database engine for pyzord
 mail-filter/pyzor:pyzord - Enable the pyzord server daemon
 mail-filter/pyzor:redis - Enables the redis back-end database engine for pyzord through dev-python/redis-py
 mail-filter/rspamd:jit - Enable PCRE JIT support
-mail-filter/rspamd:pcre2 - Use dev-libs/libpcre2
 mail-filter/spamassassin:cron - Install a cron job to update SpamAssassin's rules daily.
 mail-filter/spamassassin:qmail - Build qmail functionality and docs
 mail-mta/courier:fax - Enables fax support in the courier mail server