commit:     62fb8c221783702e99e96f239c97cdf4e73aad2f
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Wed Mar 20 07:51:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:29:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62fb8c22

app-containers/podman: remove 4.8.3 and 5.0.0_rc{5,7}

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-containers/podman/Manifest                |   3 -
 app-containers/podman/podman-4.8.3.ebuild     | 139 ------------------------
 app-containers/podman/podman-5.0.0_rc5.ebuild | 148 -------------------------
 app-containers/podman/podman-5.0.0_rc7.ebuild | 151 --------------------------
 4 files changed, 441 deletions(-)

diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 732becdc9447..d21910b422e6 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1,4 +1 @@
-DIST podman-4.8.3.tar.gz 21565162 BLAKE2B 
13d2e5800dce96ba8c1671f251c2809dc0166198b807978d44b6f10b4dd2095e909678a12518fed84a0a1b5eee5a71e944170eb55350c3af945a63910f9c8082
 SHA512 
13ade866b888d32ada3b38130d7cc4677591136e25234e040b478c5d002d1b7907ed46731996d25cc41b992b98b75f109c6e6eea44251f4ad89162b20266976d
 DIST podman-4.9.3.tar.gz 21727849 BLAKE2B 
9a67ba4266a8a0e20d165ba2bae00dcf146724ee976838d5e3310b094155ffa89bff526e8ae72864dc100d1e6878d5519d53581dc7e034982a4f2b364e4c8feb
 SHA512 
395014bbe70923f1444d2f33440013a16e9c339b70be5e6a9c7026617a40795a1c0e410c08a52fba46b9f5e853d853ce4133db36167a3c5ace7d325f8b3a3327
-DIST podman-5.0.0_rc5.tar.gz 21856941 BLAKE2B 
7800ad4d928bcc19c223a4dc6a84c32b32f8655753a8a77cca57d78b351bac911c7cf72d5425242ad93d165b620b7060e852a9b8816196136767bc500b5881f9
 SHA512 
a3ccd6eb53d66297be30ec66efa0a5fa5f5050a647c6bc5cdb2fd4cd9dd5638c42328bf1429a2fa3f8dcc84bb7d1ffbdd9c6bf06862993277f5b60d740d91c1b
-DIST podman-5.0.0_rc7.tar.gz 21865293 BLAKE2B 
36462bab50a322942053d301e9bc8d75f4b7ef9776d73c1fbf30f37eb538e98c85ddae42d8ab3cd3183b85985716d1c42b94dacf9881a74046c75e45697c0c24
 SHA512 
ce66a6a061511bcb1e2e0044dbae50a421719974bc1126cc54c725d2d72282718e7cea8a5e0013b5e10b6d3ea9efb3d84716b4906312ed0190d6e5036dcd4f97

diff --git a/app-containers/podman/podman-4.8.3.ebuild 
b/app-containers/podman/podman-4.8.3.ebuild
deleted file mode 100644
index 731c296c2fcd..000000000000
--- a/app-containers/podman/podman-4.8.3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module tmpfiles linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with 
Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/";
-
-if [[ ${PV} == 9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/containers/podman.git";
-else
-       
SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
-       S="${WORKDIR}/${P/_rc/-rc}"
-       KEYWORDS="amd64 arm64 ~riscv"
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs cgroup-hybrid wrapper +fuse +init +rootless +seccomp 
selinux systemd"
-RESTRICT="test"
-
-RDEPEND="
-       app-crypt/gpgme:=
-       >=app-containers/conmon-2.0.0
-       >=app-containers/containers-common-0.56.0
-       dev-libs/libassuan:=
-       dev-libs/libgpg-error:=
-       sys-apps/shadow:=
-
-       apparmor? ( sys-libs/libapparmor )
-       btrfs? ( sys-fs/btrfs-progs )
-       cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-       !cgroup-hybrid? ( app-containers/crun )
-       wrapper? ( !app-containers/docker-cli )
-       fuse? ( sys-fs/fuse-overlayfs )
-       init? ( app-containers/catatonit )
-       rootless? ( app-containers/slirp4netns )
-       seccomp? ( sys-libs/libseccomp:= )
-       selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
-       systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       dev-go/go-md2man
-"
-
-PATCHES=(
-       "${FILESDIR}/seccomp-toggle-4.7.0.patch"
-)
-
-CONFIG_CHECK="
-       ~USER_NS
-"
-
-pkg_setup() {
-       use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       default
-
-       # assure necessary files are present
-       local file
-       for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
-               [[ -f hack/"${file}".sh ]] || die
-       done
-
-       local feature
-       for feature in apparmor systemd; do
-               cat <<-EOF > hack/"${feature}"_tag.sh || die
-               #!/usr/bin/env bash
-               $(usex ${feature} "echo ${feature}" echo)
-               EOF
-       done
-
-       echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || 
die
-       cat <<-EOF > hack/btrfs_tag.sh || die
-       #!/usr/bin/env bash
-       $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-       EOF
-}
-
-src_compile() {
-       export PREFIX="${EPREFIX}/usr"
-
-       # bug 906073
-       use elibc_musl && export CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
-
-       # For non-live versions, prevent git operations which causes sandbox 
violations
-       # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-       [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
-
-       # BUILD_SECCOMP is used in the patch to toggle seccomp
-       emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" 
BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
-}
-
-src_install() {
-       emake DESTDIR="${D}" install install.completions $(usev wrapper 
install.docker-full)
-
-       insinto /etc/cni/net.d
-       doins cni/87-podman-bridge.conflist
-
-       newconfd "${FILESDIR}"/podman.confd podman
-       newinitd "${FILESDIR}"/podman.initd podman
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/podman.logrotated" podman
-
-       keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-       PODMAN_ROOTLESS_UPGRADE=false
-       if use rootless; then
-               has_version 'app-containers/podman[rootless]' || 
PODMAN_ROOTLESS_UPGRADE=true
-       fi
-}
-
-pkg_postinst() {
-       tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-
-       local want_newline=false
-       if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-               ${want_newline} && elog ""
-               elog "For rootless operation, you need to configure 
subuid/subgid"
-               elog "for user running podman. In case subuid/subgid has only 
been"
-               elog "configured for root, run:"
-               elog "usermod --add-subuids 1065536-1131071 <user>"
-               elog "usermod --add-subgids 1065536-1131071 <user>"
-               want_newline=true
-       fi
-}

diff --git a/app-containers/podman/podman-5.0.0_rc5.ebuild 
b/app-containers/podman/podman-5.0.0_rc5.ebuild
deleted file mode 100644
index 031861e35e9e..000000000000
--- a/app-containers/podman/podman-5.0.0_rc5.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module tmpfiles linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with 
Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/";
-
-if [[ ${PV} == 9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/containers/podman.git";
-else
-       
SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
-       S="${WORKDIR}/${P/_rc/-rc}"
-       if [[ ${PV} != *rc* ]] ; then
-               KEYWORDS="~amd64 ~arm64 ~riscv"
-       fi
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs cgroup-hybrid cron wrapper +fuse +init +rootless +seccomp 
selinux systemd"
-RESTRICT="test"
-
-RDEPEND="
-       app-crypt/gpgme:=
-       >=app-containers/conmon-2.0.0
-       >=app-containers/containers-common-0.56.0
-       dev-libs/libassuan:=
-       dev-libs/libgpg-error:=
-       sys-apps/shadow:=
-
-       apparmor? ( sys-libs/libapparmor )
-       btrfs? ( sys-fs/btrfs-progs )
-       cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-       !cgroup-hybrid? ( app-containers/crun )
-       cron? ( virtual/cron )
-       wrapper? ( !app-containers/docker-cli )
-       fuse? ( sys-fs/fuse-overlayfs )
-       init? ( app-containers/catatonit )
-       rootless? ( app-containers/slirp4netns )
-       seccomp? ( sys-libs/libseccomp:= )
-       selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
-       systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       dev-go/go-md2man
-"
-
-PATCHES=(
-       "${FILESDIR}/seccomp-toggle-4.7.0.patch"
-)
-
-CONFIG_CHECK="
-       ~USER_NS
-"
-
-pkg_setup() {
-       use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       default
-
-       # assure necessary files are present
-       local file
-       for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
-               [[ -f hack/"${file}".sh ]] || die
-       done
-
-       local feature
-       for feature in apparmor systemd; do
-               cat <<-EOF > hack/"${feature}"_tag.sh || die
-               #!/usr/bin/env bash
-               $(usex ${feature} "echo ${feature}" echo)
-               EOF
-       done
-
-       echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || 
die
-       cat <<-EOF > hack/btrfs_tag.sh || die
-       #!/usr/bin/env bash
-       $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-       EOF
-}
-
-src_compile() {
-       export PREFIX="${EPREFIX}/usr"
-
-       # bug 906073
-       use elibc_musl && export CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
-
-       # For non-live versions, prevent git operations which causes sandbox 
violations
-       # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-       [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
-
-       # BUILD_SECCOMP is used in the patch to toggle seccomp
-       emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" 
BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
-}
-
-src_install() {
-       emake DESTDIR="${D}" install install.completions $(usev wrapper 
install.docker-full)
-
-       insinto /etc/cni/net.d
-       doins cni/87-podman-bridge.conflist
-
-       newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
-       newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
-
-       newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
-       newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
-
-       use cron && \
-               { exeinto /etc/cron.daily && newexe 
"${FILESDIR}"/podman-auto-update-5.0.0_rc4.cron podman-auto-update; }
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/podman.logrotated" podman
-
-       keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-       PODMAN_ROOTLESS_UPGRADE=false
-       if use rootless; then
-               has_version 'app-containers/podman[rootless]' || 
PODMAN_ROOTLESS_UPGRADE=true
-       fi
-}
-
-pkg_postinst() {
-       tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-
-       local want_newline=false
-       if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-               ${want_newline} && elog ""
-               elog "For rootless operation, you need to configure 
subuid/subgid"
-               elog "for user running podman. In case subuid/subgid has only 
been"
-               elog "configured for root, run:"
-               elog "usermod --add-subuids 1065536-1131071 <user>"
-               elog "usermod --add-subgids 1065536-1131071 <user>"
-               want_newline=true
-       fi
-}

diff --git a/app-containers/podman/podman-5.0.0_rc7.ebuild 
b/app-containers/podman/podman-5.0.0_rc7.ebuild
deleted file mode 100644
index 2027b142f82f..000000000000
--- a/app-containers/podman/podman-5.0.0_rc7.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module tmpfiles linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with 
Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/";
-
-if [[ ${PV} == 9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/containers/podman.git";
-else
-       
SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
-       S="${WORKDIR}/${P/_rc/-rc}"
-       if [[ ${PV} != *rc* ]] ; then
-               KEYWORDS="~amd64 ~arm64 ~riscv"
-       fi
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs cgroup-hybrid cron wrapper +fuse +init +rootless +seccomp 
selinux systemd"
-RESTRICT="test"
-
-RDEPEND="
-       app-crypt/gpgme:=
-       >=app-containers/conmon-2.0.0
-       >=app-containers/containers-common-0.56.0
-       dev-libs/libassuan:=
-       dev-libs/libgpg-error:=
-       sys-apps/shadow:=
-
-       apparmor? ( sys-libs/libapparmor )
-       btrfs? ( sys-fs/btrfs-progs )
-       cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-       !cgroup-hybrid? ( app-containers/crun )
-       cron? ( virtual/cron )
-       wrapper? ( !app-containers/docker-cli )
-       fuse? ( sys-fs/fuse-overlayfs )
-       init? ( app-containers/catatonit )
-       rootless? ( app-containers/slirp4netns )
-       seccomp? ( sys-libs/libseccomp:= )
-       selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
-       systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       dev-go/go-md2man
-"
-
-PATCHES=(
-       "${FILESDIR}/seccomp-toggle-4.7.0.patch"
-)
-
-CONFIG_CHECK="
-       ~USER_NS
-"
-
-pkg_setup() {
-       use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       default
-
-       # assure necessary files are present
-       local file
-       for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
-               [[ -f hack/"${file}".sh ]] || die
-       done
-
-       local feature
-       for feature in apparmor systemd; do
-               cat <<-EOF > hack/"${feature}"_tag.sh || die
-               #!/usr/bin/env bash
-               $(usex ${feature} "echo ${feature}" echo)
-               EOF
-       done
-
-       echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || 
die
-       cat <<-EOF > hack/btrfs_tag.sh || die
-       #!/usr/bin/env bash
-       $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-       EOF
-}
-
-src_compile() {
-       export PREFIX="${EPREFIX}/usr"
-
-       # bug 906073
-       use elibc_musl && export CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
-
-       # For non-live versions, prevent git operations which causes sandbox 
violations
-       # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-       [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
-
-       # BUILD_SECCOMP is used in the patch to toggle seccomp
-       emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" 
BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
-}
-
-src_install() {
-       emake DESTDIR="${D}" install install.completions $(usev wrapper 
install.docker-full)
-
-       insinto /etc/cni/net.d
-       doins cni/87-podman-bridge.conflist
-
-       newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
-       newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
-
-       newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
-       newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
-
-       newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd 
podman-clean-transient
-       newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd 
podman-clean-transient
-
-       use cron && \
-               { exeinto /etc/cron.daily && newexe 
"${FILESDIR}"/podman-auto-update-5.0.0_rc4.cron podman-auto-update; }
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/podman.logrotated" podman
-
-       keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-       PODMAN_ROOTLESS_UPGRADE=false
-       if use rootless; then
-               has_version 'app-containers/podman[rootless]' || 
PODMAN_ROOTLESS_UPGRADE=true
-       fi
-}
-
-pkg_postinst() {
-       tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-
-       local want_newline=false
-       if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-               ${want_newline} && elog ""
-               elog "For rootless operation, you need to configure 
subuid/subgid"
-               elog "for user running podman. In case subuid/subgid has only 
been"
-               elog "configured for root, run:"
-               elog "usermod --add-subuids 1065536-1131071 <user>"
-               elog "usermod --add-subgids 1065536-1131071 <user>"
-               want_newline=true
-       fi
-}

Reply via email to