1 files changed, 31 insertions, 31 deletions

diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 4a73be05df93..04230d7d7e30 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -307,7 +307,7 @@ acct-group/redis_exporter 0: System group: redis_exporter
 acct-group/redmine 0-r1: System group: redmine
 acct-group/redsocks 0-r1: A group for net-proxy/redsocks
 acct-group/reg 0-r1: A group for app-emulation/reg
-acct-group/registry 0: A group for app-emulation/docker-registry
+acct-group/registry 0: A group for app-containers/docker-registry
 acct-group/render 0-r1: System group: render
 acct-group/resin 0: A group for www-servers/resin
 acct-group/roccat 0: A group for sys-apps/roccat-tools
@@ -741,7 +741,7 @@ acct-user/redis_exporter 0: A user for app-metrics/redis_exporter
 acct-user/redmine 0-r1: Redmine application user
 acct-user/redsocks 0-r1: A user for net-proxy/redsocks
 acct-user/reg 0-r1: A user for app-emulation/reg
-acct-user/registry 0: A user for app-emulation/docker-registry
+acct-user/registry 0: A user for app-containers/docker-registry
 acct-user/root 0-r1: System user: root
 acct-user/ros 0: A user for dev-ros/roslaunch
 acct-user/rplayd 0: A user for media-sound/rplay
@@ -1305,8 +1305,37 @@ app-cdr/uif2iso 0.1.7c-r1: Convert CD images from uif (MagicISO) to iso
 app-cdr/xbiso 0.6.1-r3: Xbox xdvdfs ISO extraction utility
 app-cdr/xcdroast 0.98_alpha16-r3: Lightweight cdrtools front-end for CD and DVD writing
 app-cdr/xfburn 0.6.2: GTK+ based CD and DVD burning application
+app-containers/buildah 1.21.1 1.23.1: A tool that facilitates building OCI images
+app-containers/cadvisor 0.36.0: Analyzes resource usage and performance characteristics of running containers
+app-containers/conmon 2.0.30 2.0.31: An OCI container runtime monitor
 app-containers/containerd 1.4.11 1.4.12 1.5.7: A daemon to control runC
+app-containers/containers-storage 1.30.0: containers/storage library
+app-containers/cri-o 1.21.0 1.21.4 1.22.1: OCI-based implementation of Kubernetes Container Runtime Interface
+app-containers/cri-tools 1.18.0 1.21.0: CLI and validation tools for Kubelet Container Runtime (CRI)
+app-containers/crun 0.19.1-r1 1.2 1.3: A fast and low-memory footprint OCI Container Runtime fully written in C
+app-containers/distrobuilder 1.1 1.2: System container image builder for LXC and LXD
+app-containers/docker 20.10.9 20.10.12-r1: The core functions you need to create Docker images and run Docker containers
+app-containers/docker-bench-security 1.3.2 1.3.3: Test for best practices around deploying docker containers
+app-containers/docker-cli 20.10.9 20.10.12: the command line binary for docker
+app-containers/docker-compose 1.28.6 1.29.0 1.29.1 1.29.2-r1: Multi-container orchestration for Docker
+app-containers/docker-credential-helpers 0.6.3: A suite of programs to use native stores to keep Docker credentials safe
+app-containers/docker-gc 9999: Docker garbage collection of containers and images
 app-containers/docker-proxy 0.8.0_p20210525: Docker container networking
+app-containers/docker-registry 2.7.1-r1: Docker Registry 2.0
+app-containers/docker-swarm 1.2.9: Swarm Classic: a container clustering system
+app-containers/go-secbench 0.1.0 0.1.0-r1: run and evaluate the docker security benchmark
+app-containers/img 0.5.11: Standalone daemon-less unprivileged Dockerfile and OCI container image builder
+app-containers/k3d 4.4.2: k3d creates k3s clusters in docker
+app-containers/kompose 1.22.0: Tool to move from docker-compose to Kubernetes
+app-containers/nerdctl 0.14.0 0.15.0: Docker-compatible CLI for containerd, with support for Compose
+app-containers/podman 3.3.1 3.4.0 3.4.1 3.4.2 3.4.3 3.4.4: Library and podman tool for running OCI-based containers in Pods
+app-containers/runc 1.0.2-r1 1.0.3: runc container cli tools
+app-containers/s6-overlay 1.18.1.3 2.1.0.2-r1: an s6-based init system for containers
+app-containers/sen 0.6.1_p20200905: Terminal User Interface for docker engine
+app-containers/skopeo 0.1.41 0.2.0 1.1.0 1.1.1 1.3.0 1.3.1 1.5.1: Command line utility foroperations on container images and image repositories
+app-containers/slirp4netns 1.1.9 1.1.12: User-mode networking for unprivileged network namespaces
+app-containers/snapd 2.53.1 2.53.2 2.53.4: Service and tools for management of snap packages
+app-containers/umoci 0.2.1 0.4.6: Manipulation tool for OCI images
 app-crypt/acme 1.20.0 1.21.0 1.22.0 9999: An implementation of the ACME protocol
 app-crypt/acme-sh 3.0.1 9999: A pure Unix shell script implementing ACME client protocol
 app-crypt/acme-tiny 4.1.0 9999: A tiny, auditable script for Let's Encrypt's ACME Protocol
@@ -2375,30 +2404,14 @@ app-emacs/zenirc 2.112-r1: A full-featured scriptable IRC client for the Emacs t
 app-emulation/aqemu 0.9.2-r1: Graphical interface for QEMU and KVM emulators, using Qt5
 app-emulation/aranym 1.1.0: Atari Running on Any Machine, VM running Atari ST/TT/Falcon OS and TOS/GEM apps
 app-emulation/bochs 2.6.10 2.7 9999: LGPL-ed pc emulator
-app-emulation/buildah 1.21.1 1.23.1: A tool that facilitates building OCI images
-app-emulation/cadvisor 0.36.0: Analyzes resource usage and performance characteristics of running containers
 app-emulation/cloud-init 20.4 21.2 9999: Cloud instance initialisation magic
 app-emulation/coldfire 0.3.1: Motorola Coldfire Emulator
-app-emulation/conmon 2.0.30 2.0.31: An OCI container runtime monitor
-app-emulation/containers-storage 1.30.0: containers/storage library
-app-emulation/cri-o 1.21.0 1.21.4 1.22.1: OCI-based implementation of Kubernetes Container Runtime Interface
-app-emulation/cri-tools 1.18.0 1.21.0: CLI and validation tools for Kubelet Container Runtime (CRI)
 app-emulation/crossover-bin 20.0.4-r1 21.0.0 21.1.0: Commercial version of app-emulation/wine with paid support
-app-emulation/crun 0.19.1-r1 1.2 1.3: A fast and low-memory footprint OCI Container Runtime fully written in C
 app-emulation/dinero 4.7-r1: Cache simulator
 app-emulation/diskimage-builder 3.16.0 9999: Golden Disk Image builder.
-app-emulation/distrobuilder 1.1 1.2: System container image builder for LXC and LXD
 app-emulation/dlx 1.0.0 1.5.20: DLX Simulator
-app-emulation/docker 20.10.9 20.10.12-r1: The core functions you need to create Docker images and run Docker containers
-app-emulation/docker-bench-security 1.3.2 1.3.3: Test for best practices around deploying docker containers
-app-emulation/docker-cli 20.10.9 20.10.12: the command line binary for docker
-app-emulation/docker-compose 1.28.6 1.29.0 1.29.1 1.29.2-r1: Multi-container orchestration for Docker
-app-emulation/docker-credential-helpers 0.6.3: A suite of programs to use native stores to keep Docker credentials safe
-app-emulation/docker-gc 9999: Docker garbage collection of containers and images
 app-emulation/docker-machine 0.13.0: Machine management for a container-centric world
 app-emulation/docker-machine-kvm 0.10.0: KVM driver for docker-machine
-app-emulation/docker-registry 2.7.1-r1: Docker Registry 2.0
-app-emulation/docker-swarm 1.2.9: Swarm Classic: a container clustering system
 app-emulation/dosemu 1.4.1_pre20130107-r5: DOS Emulator
 app-emulation/dynamips 0.2.21: Cisco 7200/3600 Simulator
 app-emulation/edumips64 1.2: A visual and cross-platform MIPS64 CPU Simulator
@@ -2414,15 +2427,11 @@ app-emulation/gallium-nine-standalone 0.7-r1 0.8-r1 9999: A standalone version o
 app-emulation/ganeti-os-noop 0.2: Dummy OS provider for Ganeti
 app-emulation/genymotion-bin 3.2.1: Complete set of tools that provide a virtual environment for Android
 app-emulation/glean 1.18.2: Simple program to write static config from config-drive
-app-emulation/go-secbench 0.1.0 0.1.0-r1: run and evaluate the docker security benchmark
 app-emulation/grub-xen-host 1.0-r1: Grub2 built as a PV grub per the Xen PV Boot Protocol
 app-emulation/guestfs-tools 1.46.1-r1: Tools for accessing, inspecting, and modifying virtual machine (VM) disk images
 app-emulation/gxemul 0.6.2: A Machine Emulator, Mainly emulates MIPS, but supports other CPU types
 app-emulation/hercules 3.13-r1: Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator
 app-emulation/hyperd 0.7.0-r1: Hypervisor-based Runtime for OCI
-app-emulation/img 0.5.11: Standalone daemon-less unprivileged Dockerfile and OCI container image builder
-app-emulation/k3d 4.4.2: k3d creates k3s clusters in docker
-app-emulation/kompose 1.22.0: Tool to move from docker-compose to Kubernetes
 app-emulation/libcacard 2.6.0: virtual Common Access Card (CAC) library emulator
 app-emulation/libdsk 1.5.8: LIBDSK is a library for accessing discs and disc image files
 app-emulation/libguestfs 1.38.6-r104 1.44.1-r1 1.46.0-r2: Tools for accessing, inspecting, and modifying virtual machine (VM) disk images
@@ -2435,11 +2444,9 @@ app-emulation/lxc 4.0.11_p1-r1: A userspace interface for the Linux kernel conta
 app-emulation/lxc-templates 3.0.4: Old style template scripts for LXC
 app-emulation/lxd 4.0.7-r2 4.0.8-r1: Fast, dense and secure container management
 app-emulation/nemu 2.5.0-r1: ncurses interface for QEMU
-app-emulation/nerdctl 0.14.0 0.15.0: Docker-compatible CLI for containerd, with support for Compose
 app-emulation/open-vm-tools 11.2.5_p17337674-r3 11.3.5_p18557794: Tools for VMware guests
 app-emulation/pcem 17: A PC emulator that specializes in running old operating systems and software
 app-emulation/phpvirtualbox 5.2.1: Web-based administration for VirtualBox in PHP
-app-emulation/podman 3.3.1 3.4.0 3.4.1 3.4.2 3.4.3 3.4.4: Library and podman tool for running OCI-based containers in Pods
 app-emulation/protontricks 1.6.0 1.6.2: app-emulation/winetricks wrapper for Proton (Steam Play) games
 app-emulation/punes 0.107: Nintendo Entertainment System (NES) emulator
 app-emulation/q4wine 1.3.12: Qt GUI configuration tool for Wine
@@ -2449,16 +2456,10 @@ app-emulation/qemu-init-scripts 0.3.0-r1: Kvm and qemu init scripts
 app-emulation/qemu-riscv64-bin 5.0.0: Statically linked x86-64 binary of app-emulation/qemu, riscv64 emulator
 app-emulation/reg 0.16.1: Docker registry v2 command line client
 app-emulation/ruffle 0_p20211214 9999: Flash Player emulator written in Rust
-app-emulation/runc 1.0.2-r1 1.0.3: runc container cli tools
 app-emulation/runv 0.7.0: Hypervisor-based Runtime for OCI
-app-emulation/s6-overlay 1.18.1.3 2.1.0.2-r1: an s6-based init system for containers
-app-emulation/sen 0.6.1_p20200905: Terminal User Interface for docker engine
 app-emulation/simh 3.11.1: a simulator for historical computers such as Vax, PDP-11 etc.)
 app-emulation/simplevirt 0.0_p20181012-r1 0.1: Simple virtual machine manager for Linux (QEMU/KVM)
 app-emulation/ski 1.3.2-r4: ia64 instruction set simulator
-app-emulation/skopeo 0.1.41 0.2.0 1.1.0 1.1.1 1.3.0 1.3.1 1.5.1: Command line utility foroperations on container images and image repositories
-app-emulation/slirp4netns 1.1.9 1.1.12: User-mode networking for unprivileged network namespaces
-app-emulation/snapd 2.53.1 2.53.2 2.53.4: Service and tools for management of snap packages
 app-emulation/softgun 0.22: ARM software emulator
 app-emulation/spectemu 0.99.3-r1: 48k ZX Spectrum Emulator
 app-emulation/spice 0.14.3-r1 0.15.0 9999: SPICE server
@@ -2466,7 +2467,6 @@ app-emulation/spice-protocol 0.14.1 0.14.3 9999: Headers defining the SPICE prot
 app-emulation/spice-vdagent 0.19.0-r1 0.21.0: SPICE VD Linux Guest Agent
 app-emulation/spim 8.0-r3: MIPS Simulator
 app-emulation/uade 2.13-r2: Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation
-app-emulation/umoci 0.2.1 0.4.6: Manipulation tool for OCI images
 app-emulation/vagrant 2.2.7-r1 2.2.9-r1 2.2.18-r1: A tool for building and distributing development environments
 app-emulation/vendor-reset 0.1.0 9999: Linux kernel vendor specific hardware reset module
 app-emulation/vice 3.5-r1: The Versatile Commodore Emulator