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@icloud.com>
Signed-off-by: William Hubbs <williamh@gentoo.org>

6 files changed, 2 insertions, 100 deletions

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/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
deleted file mode 100644
index c093ccfee4f5..000000000000
--- a/net-misc/cni-plugins/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cni-plugins-0.9.1.tar.gz 2703099 BLAKE2B 878f476e62f12020b39d33a79723fe246b34d80705d3a336573401743392adca9a57b196d6d191b4a6f281110f47ecbb1525aacd91cd488bea61c7aaed12a6ef SHA512 24e8fcedbff2ae7a83aa96085b546b164de6a0884d593e3b5386e9d2de3c4d9a215db9e9405332020cc45c371709a32b600e263e4f8dee62c51adafdc0180f24
-DIST cni-plugins-1.1.1.tar.gz 3076064 BLAKE2B 2fd70260995e423d2b4ac3a8d2135074baffe5d36177d5e1e5a9ce146f6d2ecfeb3b843de62e43f863085ff965be4160cf5f4cae892d3c59070ef390409ef3c9 SHA512 03da31caee5f9595abf65d4a551984b995bc18c5e97409549f08997c5a6a2b41a8950144f8a5b4f810cb401ddbe312232d2be76ec977acf8108eb490786b1817
diff --git a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild b/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild
deleted file mode 100644
index 5d4529918862..000000000000
--- a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info
-
-DESCRIPTION="Standard networking plugins for container networking"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-IUSE="hardened"
-
-CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
-S="${WORKDIR}/plugins-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
-}
diff --git a/net-misc/cni-plugins/cni-plugins-1.1.1.ebuild b/net-misc/cni-plugins/cni-plugins-1.1.1.ebuild
deleted file mode 100644
index 963ca87f9d33..000000000000
--- a/net-misc/cni-plugins/cni-plugins-1.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info systemd
-
-DESCRIPTION="Standard networking plugins for container networking"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="hardened"
-
-CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
-S="${WORKDIR}/plugins-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	systemd_dounit plugins/ipam/dhcp/systemd/cni-dhcp.{service,socket}
-	newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
-}
diff --git a/net-misc/cni-plugins/files/cni-dhcp.initd b/net-misc/cni-plugins/files/cni-dhcp.initd
deleted file mode 100644
index 26b838c516bd..000000000000
--- a/net-misc/cni-plugins/files/cni-dhcp.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-
-name="CNI-DHCP"
-description="virtual dhcp server for containers"
-command="/opt/cni/bin/dhcp"
-command_args="daemon"
-command_background=true
-pidfile="/run/${RC_SVCNAME}.pid"
-
-depend() {
-	need net
-}
-
-stop_post() {
-	if [ -e /run/cni/dhcp.sock ]; then
-		ebegin "Cleaning socket for ${name}"
-		rm -f /run/cni/dhcp.sock
-		eend $? "Failed to cleanup socket"
-	fi
-}
diff --git a/net-misc/cni-plugins/metadata.xml b/net-misc/cni-plugins/metadata.xml
deleted file mode 100644
index 8359d9316145..000000000000
--- a/net-misc/cni-plugins/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="person">
-    <email>williamh@gentoo.org</email>
-    <name>William Hubbs</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">containernetworking/plugins</remote-id>
-  </upstream>
-</pkgmetadata>