commit: 3d7978052da3f2cc54fce6653d7ee0c23d98be09 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Sat Jul 16 21:37:20 2022 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Sat Jul 16 21:39:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d797805
net-misc/cni-plugins: move to app-containers/cni-plugins Closes: https://github.com/gentoo/gentoo/pull/25627 Thanks-to: Randall T. Vasquez <ran.dall <AT> icloud.com> Signed-off-by: William Hubbs <williamh <AT> gentoo.org> {net-misc => app-containers}/cni-plugins/Manifest | 0 {net-misc => app-containers}/cni-plugins/cni-plugins-0.9.1.ebuild | 0 {net-misc => app-containers}/cni-plugins/cni-plugins-1.1.1.ebuild | 0 {net-misc => app-containers}/cni-plugins/files/cni-dhcp.initd | 0 {net-misc => app-containers}/cni-plugins/metadata.xml | 0 app-containers/cri-o/cri-o-1.24.1.ebuild | 2 +- app-containers/podman/podman-4.1.0.ebuild | 2 +- app-containers/podman/podman-4.1.1.ebuild | 2 +- net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild | 4 ++-- profiles/updates/3Q-2022 | 1 + 10 files changed, 6 insertions(+), 5 deletions(-) diff --git a/net-misc/cni-plugins/Manifest b/app-containers/cni-plugins/Manifest similarity index 100% rename from net-misc/cni-plugins/Manifest rename to app-containers/cni-plugins/Manifest diff --git a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild b/app-containers/cni-plugins/cni-plugins-0.9.1.ebuild similarity index 100% rename from net-misc/cni-plugins/cni-plugins-0.9.1.ebuild rename to app-containers/cni-plugins/cni-plugins-0.9.1.ebuild diff --git a/net-misc/cni-plugins/cni-plugins-1.1.1.ebuild b/app-containers/cni-plugins/cni-plugins-1.1.1.ebuild similarity index 100% rename from net-misc/cni-plugins/cni-plugins-1.1.1.ebuild rename to app-containers/cni-plugins/cni-plugins-1.1.1.ebuild diff --git a/net-misc/cni-plugins/files/cni-dhcp.initd b/app-containers/cni-plugins/files/cni-dhcp.initd similarity index 100% rename from net-misc/cni-plugins/files/cni-dhcp.initd rename to app-containers/cni-plugins/files/cni-dhcp.initd diff --git a/net-misc/cni-plugins/metadata.xml b/app-containers/cni-plugins/metadata.xml similarity index 100% rename from net-misc/cni-plugins/metadata.xml rename to app-containers/cni-plugins/metadata.xml diff --git a/app-containers/cri-o/cri-o-1.24.1.ebuild b/app-containers/cri-o/cri-o-1.24.1.ebuild index 7248891b8cf2..b92849f49f50 100644 --- a/app-containers/cri-o/cri-o-1.24.1.ebuild +++ b/app-containers/cri-o/cri-o-1.24.1.ebuild @@ -25,7 +25,7 @@ COMMON_DEPEND=" dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables - net-misc/cni-plugins + app-containers/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= diff --git a/app-containers/podman/podman-4.1.0.ebuild b/app-containers/podman/podman-4.1.0.ebuild index 0ce02e6d090a..aa2258b0879a 100644 --- a/app-containers/podman/podman-4.1.0.ebuild +++ b/app-containers/podman/podman-4.1.0.ebuild @@ -25,7 +25,7 @@ COMMON_DEPEND=" !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= - >=net-misc/cni-plugins-0.8.6 + >=app-containers/cni-plugins-0.8.6 sys-fs/lvm2 sys-libs/libseccomp:= diff --git a/app-containers/podman/podman-4.1.1.ebuild b/app-containers/podman/podman-4.1.1.ebuild index 3afbd1e6f799..c0e1f032e08b 100644 --- a/app-containers/podman/podman-4.1.1.ebuild +++ b/app-containers/podman/podman-4.1.1.ebuild @@ -25,7 +25,7 @@ COMMON_DEPEND=" !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= - >=net-misc/cni-plugins-0.8.6 + >=app-containers/cni-plugins-0.8.6 sys-fs/lvm2 sys-libs/libseccomp:= diff --git a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild b/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild index 5de889537c18..d7fd91558458 100644 --- a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild +++ b/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -86,7 +86,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="" -RDEPEND="net-misc/cni-plugins" +RDEPEND="app-containers/cni-plugins" src_prepare() { default diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022 index 53c36e27e2a0..3450a7c4f9ac 100644 --- a/profiles/updates/3Q-2022 +++ b/profiles/updates/3Q-2022 @@ -7,3 +7,4 @@ move sci-libs/shapely dev-python/shapely move games-action/brutal-legend games-action/brutal-legend-hb move kde-apps/kdesdk-kioslaves dev-util/kio-perldoc move kde-apps/zeroconf-ioslave net-misc/kio-zeroconf +move net-misc/cni-plugins app-containers/cni-plugins
