Move {app-emulation -> app-containers}/slirp4netns

Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>

10 files changed, 6 insertions, 103 deletions

diff --git a/app-emulation/podman/podman-3.3.1.ebuild b/app-emulation/podman/podman-3.3.1.ebuild
index 02d4e5b90bed..94ff6ef30ce1 100644
--- a/app-emulation/podman/podman-3.3.1.ebuild
+++ b/app-emulation/podman/podman-3.3.1.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 
 	apparmor? ( sys-libs/libapparmor )
 	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-emulation/slirp4netns )
+	rootless? ( app-containers/slirp4netns )
 	selinux? ( sys-libs/libselinux:= )
 "
 DEPEND="
diff --git a/app-emulation/podman/podman-3.4.0.ebuild b/app-emulation/podman/podman-3.4.0.ebuild
index f8de5a58fe35..9d67b6fe1e9b 100644
--- a/app-emulation/podman/podman-3.4.0.ebuild
+++ b/app-emulation/podman/podman-3.4.0.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 
 	apparmor? ( sys-libs/libapparmor )
 	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-emulation/slirp4netns )
+	rootless? ( app-containers/slirp4netns )
 	selinux? ( sys-libs/libselinux:= )
 "
 DEPEND="
diff --git a/app-emulation/podman/podman-3.4.1.ebuild b/app-emulation/podman/podman-3.4.1.ebuild
index ee5c79c2785d..ca20ce779114 100644
--- a/app-emulation/podman/podman-3.4.1.ebuild
+++ b/app-emulation/podman/podman-3.4.1.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 
 	apparmor? ( sys-libs/libapparmor )
 	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-emulation/slirp4netns )
+	rootless? ( app-containers/slirp4netns )
 	selinux? ( sys-libs/libselinux:= )
 "
 DEPEND="
diff --git a/app-emulation/podman/podman-3.4.2.ebuild b/app-emulation/podman/podman-3.4.2.ebuild
index 2d7ab212ef6d..514b655b68f3 100644
--- a/app-emulation/podman/podman-3.4.2.ebuild
+++ b/app-emulation/podman/podman-3.4.2.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 
 	apparmor? ( sys-libs/libapparmor )
 	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-emulation/slirp4netns )
+	rootless? ( app-containers/slirp4netns )
 	selinux? ( sys-libs/libselinux:= )
 "
 DEPEND="
diff --git a/app-emulation/podman/podman-3.4.3.ebuild b/app-emulation/podman/podman-3.4.3.ebuild
index e3583f8e2f10..f6a088c0352a 100644
--- a/app-emulation/podman/podman-3.4.3.ebuild
+++ b/app-emulation/podman/podman-3.4.3.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 
 	apparmor? ( sys-libs/libapparmor )
 	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-emulation/slirp4netns )
+	rootless? ( app-containers/slirp4netns )
 	selinux? ( sys-libs/libselinux:= )
 "
 DEPEND="
diff --git a/app-emulation/podman/podman-3.4.4.ebuild b/app-emulation/podman/podman-3.4.4.ebuild
index e3583f8e2f10..f6a088c0352a 100644
--- a/app-emulation/podman/podman-3.4.4.ebuild
+++ b/app-emulation/podman/podman-3.4.4.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 
 	apparmor? ( sys-libs/libapparmor )
 	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-emulation/slirp4netns )
+	rootless? ( app-containers/slirp4netns )
 	selinux? ( sys-libs/libselinux:= )
 "
 DEPEND="
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
deleted file mode 100644
index 1a317b3d45bf..000000000000
--- a/app-emulation/slirp4netns/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST slirp4netns-1.1.12.tar.gz 60223 BLAKE2B 2bd4ed6cded075a151fec0e6b2222b0a72f2027d702cd3e2760ab8c811e375ea5becfeb32ccf71f4b41a257b9e7f32852d6d805912ad950da3364e240d191674 SHA512 82584e40079c2a7730c098f2a2406dc042498f7d50cc9ad8404acf3bb3a50c6969737be531d64b2eca6ba86a968bb5bfea9ad10eba4979cc40a5da5c9745ebdb
-DIST slirp4netns-1.1.9.tar.gz 58951 BLAKE2B e4fde408b3cd55dec0cca495c58936ec32c6201a0fe63c1a9fc9502ac41da615f92271d5fb365475f6864dd3c195097c81f01268b1b8d10d0f888c4e154cac34 SHA512 6471bf2b2eff9bd3ef037de986ab612f20bfce7a52bfd2b1b434d0606a3d2e6170b3fc43b168c8cc6f56ffb82f8361f21a26522ac1092c71f6e694a9588d5854
diff --git a/app-emulation/slirp4netns/metadata.xml b/app-emulation/slirp4netns/metadata.xml
deleted file mode 100644
index 0b87d9c1ea79..000000000000
--- a/app-emulation/slirp4netns/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>g.braeunlich@disroot.org</email>
-		<name>Gerhard Bräunlich</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">rootless-containers/slirp4netns</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-emulation/slirp4netns/slirp4netns-1.1.12.ebuild b/app-emulation/slirp4netns/slirp4netns-1.1.12.ebuild
deleted file mode 100644
index ed0001b6ac3d..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-1.1.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 arm64 ~ppc64"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2=
-	dev-libs/libpcre:=
-	net-libs/libslirp:=
-	sys-libs/libseccomp:=
-	sys-libs/libcap:="
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT+=" test"
-
-src_prepare() {
-	# Respect AR variable for bug 722162.
-	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
-		-i configure.ac || die
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-emulation/slirp4netns/slirp4netns-1.1.9.ebuild b/app-emulation/slirp4netns/slirp4netns-1.1.9.ebuild
deleted file mode 100644
index d200849be68c..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-1.1.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2=
-	dev-libs/libpcre:=
-	net-libs/libslirp:=
-	sys-libs/libseccomp:=
-	sys-libs/libcap:="
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT="test"
-
-src_prepare() {
-	# Respect AR variable for bug 722162.
-	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
-		-i configure.ac || die
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}