commit: b8665828cc76730a85e9405526ad820f97a240db
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 07:34:13 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 08:51:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8665828
Move {app-emulation -> app-containers}/podman
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
app-containers/cri-o/cri-o-1.21.0.ebuild | 2 +-
app-containers/cri-o/cri-o-1.21.4.ebuild | 2 +-
app-containers/cri-o/cri-o-1.22.1.ebuild | 2 +-
{app-emulation => app-containers}/podman/Manifest | 0
{app-emulation => app-containers}/podman/files/podman.confd | 0
{app-emulation => app-containers}/podman/files/podman.initd | 0
{app-emulation => app-containers}/podman/files/podman.logrotated | 0
{app-emulation => app-containers}/podman/metadata.xml | 0
{app-emulation => app-containers}/podman/podman-3.3.1.ebuild | 2 +-
{app-emulation => app-containers}/podman/podman-3.4.0.ebuild | 2 +-
{app-emulation => app-containers}/podman/podman-3.4.1.ebuild | 2 +-
{app-emulation => app-containers}/podman/podman-3.4.2.ebuild | 2 +-
{app-emulation => app-containers}/podman/podman-3.4.3.ebuild | 2 +-
{app-emulation => app-containers}/podman/podman-3.4.4.ebuild | 2 +-
profiles/updates/4Q-2021 | 1 +
15 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/app-containers/cri-o/cri-o-1.21.0.ebuild
b/app-containers/cri-o/cri-o-1.21.0.ebuild
index ea93fc487dfc..51699a1ed417 100644
--- a/app-containers/cri-o/cri-o-1.21.0.ebuild
+++ b/app-containers/cri-o/cri-o-1.21.0.ebuild
@@ -1933,7 +1933,7 @@ DEPEND="
${COMMON_DEPEND}
dev-go/go-md2man"
RDEPEND="${COMMON_DEPEND}
- !<app-emulation/podman-1.3.2-r1"
+ !<app-containers/podman-1.3.2-r1"
src_prepare() {
default
diff --git a/app-containers/cri-o/cri-o-1.21.4.ebuild
b/app-containers/cri-o/cri-o-1.21.4.ebuild
index d3148d9c76ab..a7724cecf4ef 100644
--- a/app-containers/cri-o/cri-o-1.21.4.ebuild
+++ b/app-containers/cri-o/cri-o-1.21.4.ebuild
@@ -1977,7 +1977,7 @@ DEPEND="
${COMMON_DEPEND}
dev-go/go-md2man"
RDEPEND="${COMMON_DEPEND}
- !<app-emulation/podman-1.3.2-r1"
+ !<app-containers/podman-1.3.2-r1"
src_prepare() {
default
diff --git a/app-containers/cri-o/cri-o-1.22.1.ebuild
b/app-containers/cri-o/cri-o-1.22.1.ebuild
index dc6344f8095e..b7d6765090d4 100644
--- a/app-containers/cri-o/cri-o-1.22.1.ebuild
+++ b/app-containers/cri-o/cri-o-1.22.1.ebuild
@@ -2015,7 +2015,7 @@ DEPEND="
${COMMON_DEPEND}
dev-go/go-md2man"
RDEPEND="${COMMON_DEPEND}
- !<app-emulation/podman-1.3.2-r1"
+ !<app-containers/podman-1.3.2-r1"
src_prepare() {
default
diff --git a/app-emulation/podman/Manifest b/app-containers/podman/Manifest
similarity index 100%
rename from app-emulation/podman/Manifest
rename to app-containers/podman/Manifest
diff --git a/app-emulation/podman/files/podman.confd
b/app-containers/podman/files/podman.confd
similarity index 100%
rename from app-emulation/podman/files/podman.confd
rename to app-containers/podman/files/podman.confd
diff --git a/app-emulation/podman/files/podman.initd
b/app-containers/podman/files/podman.initd
similarity index 100%
rename from app-emulation/podman/files/podman.initd
rename to app-containers/podman/files/podman.initd
diff --git a/app-emulation/podman/files/podman.logrotated
b/app-containers/podman/files/podman.logrotated
similarity index 100%
rename from app-emulation/podman/files/podman.logrotated
rename to app-containers/podman/files/podman.logrotated
diff --git a/app-emulation/podman/metadata.xml
b/app-containers/podman/metadata.xml
similarity index 100%
rename from app-emulation/podman/metadata.xml
rename to app-containers/podman/metadata.xml
diff --git a/app-emulation/podman/podman-3.3.1.ebuild
b/app-containers/podman/podman-3.3.1.ebuild
similarity index 98%
rename from app-emulation/podman/podman-3.3.1.ebuild
rename to app-containers/podman/podman-3.3.1.ebuild
index 94ff6ef30ce1..ac44c72cf14e 100644
--- a/app-emulation/podman/podman-3.3.1.ebuild
+++ b/app-containers/podman/podman-3.3.1.ebuild
@@ -135,7 +135,7 @@ src_install() {
pkg_preinst() {
PODMAN_ROOTLESS_UPGRADE=false
if use rootless; then
- has_version 'app-emulation/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
+ has_version 'app-containers/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
fi
}
diff --git a/app-emulation/podman/podman-3.4.0.ebuild
b/app-containers/podman/podman-3.4.0.ebuild
similarity index 98%
rename from app-emulation/podman/podman-3.4.0.ebuild
rename to app-containers/podman/podman-3.4.0.ebuild
index 9d67b6fe1e9b..d58eb39fe82d 100644
--- a/app-emulation/podman/podman-3.4.0.ebuild
+++ b/app-containers/podman/podman-3.4.0.ebuild
@@ -135,7 +135,7 @@ src_install() {
pkg_preinst() {
PODMAN_ROOTLESS_UPGRADE=false
if use rootless; then
- has_version 'app-emulation/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
+ has_version 'app-containers/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
fi
}
diff --git a/app-emulation/podman/podman-3.4.1.ebuild
b/app-containers/podman/podman-3.4.1.ebuild
similarity index 98%
rename from app-emulation/podman/podman-3.4.1.ebuild
rename to app-containers/podman/podman-3.4.1.ebuild
index ca20ce779114..4097b7d5adb1 100644
--- a/app-emulation/podman/podman-3.4.1.ebuild
+++ b/app-containers/podman/podman-3.4.1.ebuild
@@ -135,7 +135,7 @@ src_install() {
pkg_preinst() {
PODMAN_ROOTLESS_UPGRADE=false
if use rootless; then
- has_version 'app-emulation/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
+ has_version 'app-containers/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
fi
}
diff --git a/app-emulation/podman/podman-3.4.2.ebuild
b/app-containers/podman/podman-3.4.2.ebuild
similarity index 98%
rename from app-emulation/podman/podman-3.4.2.ebuild
rename to app-containers/podman/podman-3.4.2.ebuild
index 514b655b68f3..9ce7f02cfc06 100644
--- a/app-emulation/podman/podman-3.4.2.ebuild
+++ b/app-containers/podman/podman-3.4.2.ebuild
@@ -135,7 +135,7 @@ src_install() {
pkg_preinst() {
PODMAN_ROOTLESS_UPGRADE=false
if use rootless; then
- has_version 'app-emulation/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
+ has_version 'app-containers/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
fi
}
diff --git a/app-emulation/podman/podman-3.4.3.ebuild
b/app-containers/podman/podman-3.4.3.ebuild
similarity index 98%
rename from app-emulation/podman/podman-3.4.3.ebuild
rename to app-containers/podman/podman-3.4.3.ebuild
index f6a088c0352a..bdd678320e5f 100644
--- a/app-emulation/podman/podman-3.4.3.ebuild
+++ b/app-containers/podman/podman-3.4.3.ebuild
@@ -135,7 +135,7 @@ src_install() {
pkg_preinst() {
PODMAN_ROOTLESS_UPGRADE=false
if use rootless; then
- has_version 'app-emulation/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
+ has_version 'app-containers/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
fi
}
diff --git a/app-emulation/podman/podman-3.4.4.ebuild
b/app-containers/podman/podman-3.4.4.ebuild
similarity index 98%
rename from app-emulation/podman/podman-3.4.4.ebuild
rename to app-containers/podman/podman-3.4.4.ebuild
index f6a088c0352a..bdd678320e5f 100644
--- a/app-emulation/podman/podman-3.4.4.ebuild
+++ b/app-containers/podman/podman-3.4.4.ebuild
@@ -135,7 +135,7 @@ src_install() {
pkg_preinst() {
PODMAN_ROOTLESS_UPGRADE=false
if use rootless; then
- has_version 'app-emulation/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
+ has_version 'app-containers/podman[rootless]' ||
PODMAN_ROOTLESS_UPGRADE=true
fi
}
diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index 604a8fc5aa0b..cc37d10cfc1d 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -48,3 +48,4 @@ move app-emulation/docker-registry
app-containers/docker-registry
move app-emulation/docker-swarm app-containers/docker-swarm
move app-emulation/go-secbench app-containers/go-secbench
move app-emulation/slirp4netns app-containers/slirp4netns
+move app-emulation/podman app-containers/podman
