diff --git a/acct-group/lxc/lxc-0.ebuild b/acct-group/lxc/lxc-0.ebuild index 5d0fe836d34c1..5a4d8a9ffcdcd 100644 --- a/acct-group/lxc/lxc-0.ebuild +++ b/acct-group/lxc/lxc-0.ebuild @@ -6,4 +6,4 @@ EAPI=7 inherit acct-group ACCT_GROUP_ID=358 -DESCRIPTION="Group for app-emulation/lxc" +DESCRIPTION="Group for app-containers/lxc" diff --git a/acct-user/lxc/lxc-0.ebuild b/acct-user/lxc/lxc-0.ebuild index c0bf316bb091a..1ea4ec8d28267 100644 --- a/acct-user/lxc/lxc-0.ebuild +++ b/acct-user/lxc/lxc-0.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit acct-user -DESCRIPTION="User for app-emulation/lxc" +DESCRIPTION="User for app-containers/lxc" ACCT_USER_ID=358 ACCT_USER_GROUPS=( lxc ) diff --git a/app-containers/lxc-templates/lxc-templates-3.0.4.ebuild b/app-containers/lxc-templates/lxc-templates-3.0.4.ebuild index f8ce130795211..a1f732c6c8248 100644 --- a/app-containers/lxc-templates/lxc-templates-3.0.4.ebuild +++ b/app-containers/lxc-templates/lxc-templates-3.0.4.ebuild @@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" LICENSE="LGPL-3" SLOT="0" -RDEPEND=">=app-emulation/lxc-3.0" +RDEPEND=">=app-containers/lxc-3.0" DEPEND="${RDEPEND}" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" diff --git a/app-emulation/lxc/Manifest b/app-containers/lxc/Manifest similarity index 100% rename from app-emulation/lxc/Manifest rename to app-containers/lxc/Manifest diff --git a/app-emulation/lxc/files/lxc-2.0.5-omit-sysconfig.patch b/app-containers/lxc/files/lxc-2.0.5-omit-sysconfig.patch similarity index 100% rename from app-emulation/lxc/files/lxc-2.0.5-omit-sysconfig.patch rename to app-containers/lxc/files/lxc-2.0.5-omit-sysconfig.patch diff --git a/app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch b/app-containers/lxc/files/lxc-3.0.0-bash-completion.patch similarity index 100% rename from app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch rename to app-containers/lxc/files/lxc-3.0.0-bash-completion.patch diff --git a/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch b/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch similarity index 100% rename from app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch rename to app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch diff --git a/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch b/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch similarity index 100% rename from app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch rename to app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch diff --git a/app-emulation/lxc/files/lxc.initd.8 b/app-containers/lxc/files/lxc.initd.8 similarity index 100% rename from app-emulation/lxc/files/lxc.initd.8 rename to app-containers/lxc/files/lxc.initd.8 diff --git a/app-emulation/lxc/files/lxc_at.service.4.0.0 b/app-containers/lxc/files/lxc_at.service.4.0.0 similarity index 100% rename from app-emulation/lxc/files/lxc_at.service.4.0.0 rename to app-containers/lxc/files/lxc_at.service.4.0.0 diff --git a/app-emulation/lxc/lxc-4.0.11_p1-r1.ebuild b/app-containers/lxc/lxc-4.0.11_p1-r1.ebuild similarity index 100% rename from app-emulation/lxc/lxc-4.0.11_p1-r1.ebuild rename to app-containers/lxc/lxc-4.0.11_p1-r1.ebuild diff --git a/app-emulation/lxc/metadata.xml b/app-containers/lxc/metadata.xml similarity index 100% rename from app-emulation/lxc/metadata.xml rename to app-containers/lxc/metadata.xml diff --git a/app-containers/lxd/lxd-4.0.7-r2.ebuild b/app-containers/lxd/lxd-4.0.7-r2.ebuild index 2793b8118e4b4..0d725dd9c6435 100644 --- a/app-containers/lxd/lxd-4.0.7-r2.ebuild +++ b/app-containers/lxd/lxd-4.0.7-r2.ebuild @@ -17,7 +17,7 @@ IUSE="apparmor ipv6 nls verify-sig" DEPEND="acct-group/lxd app-arch/xz-utils - >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] + >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] diff --git a/app-containers/lxd/lxd-4.0.8-r1.ebuild b/app-containers/lxd/lxd-4.0.8-r1.ebuild index b2063d1fdb930..11314dde35da0 100644 --- a/app-containers/lxd/lxd-4.0.8-r1.ebuild +++ b/app-containers/lxd/lxd-4.0.8-r1.ebuild @@ -17,7 +17,7 @@ IUSE="apparmor ipv6 nls verify-sig" DEPEND="acct-group/lxd app-arch/xz-utils - >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] + >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)] dev-db/sqlite:3 dev-libs/dqlite dev-libs/lzo diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml index 4afc045ffdf4a..cd76572452f6a 100644 --- a/app-emulation/libvirt/metadata.xml +++ b/app-emulation/libvirt/metadata.xml @@ -33,7 +33,7 @@ - Support management of Linux Containers virtualisation (app-emulation/lxc) + Support management of Linux Containers virtualisation (app-containers/lxc) Support management of OpenVZ virtualisation (openvz-sources) diff --git a/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild index e877e7a8a55e8..31c6778822cf0 100644 --- a/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild +++ b/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" IUSE="verify-sig" -RDEPEND="app-emulation/lxc" +RDEPEND="app-containers/lxc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index 9fb51fe2bb6fc..1d5317c89ea4f 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -43,7 +43,7 @@ app-metrics/collectd collectd_plugins_slurm collectd_plugins_gpu_nvidia # Joonas Niilola (2020-06-21) # sys-apps/apparmor doesn't have stable keywords. -app-emulation/lxc apparmor +app-containers/lxc apparmor app-containers/lxd apparmor # Thomas Deutschmann (2019-10-28) diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index ecca84bd09d97..b0e644494c6ed 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -123,7 +123,7 @@ sci-physics/lammps kokkos # Joonas Niilola (2020-05-14) # sys-apps/apparmor not keyworded on x86. -app-emulation/lxc apparmor +app-containers/lxc apparmor app-containers/lxd apparmor # Thomas Deutschmann (2020-04-30) diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021 index 3441020687eb0..ff58730799b07 100644 --- a/profiles/updates/4Q-2021 +++ b/profiles/updates/4Q-2021 @@ -65,3 +65,4 @@ move app-emulation/reg app-containers/reg move app-emulation/flannel app-containers/flannel move app-emulation/lxd app-containers/lxd move app-emulation/lxc-templates app-containers/lxc-templates +move app-emulation/lxc app-containers/lxc