commit:     7919a0a21ce592e8ebe473165beb408d0f03b7a3
Author:     Rahil Bhimjiani <rahil3108 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 24 09:41:15 2023 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 03:45:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7919a0a2

app-containers/podman: drop 4.3.1 & 4.4.1

Signed-off-by: Rahil Bhimjiani <rahil3108 <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-containers/podman/Manifest               |   2 -
 app-containers/podman/podman-4.3.1.ebuild    | 165 --------------------------
 app-containers/podman/podman-4.4.1-r1.ebuild | 166 ---------------------------
 3 files changed, 333 deletions(-)

diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 0bea3f5d5e27..b41ed4569ea4 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1,3 +1 @@
-DIST podman-4.3.1.tar.gz 12674902 BLAKE2B 
6a6412e62004693cd734725556ee8a7082300676398fd2714c02168eaae29e56ec506755ef2a05b32c57620379ada3162607d01b641bc9197f9d9c77ff865fb8
 SHA512 
907dafc6481cbcb7a9b6771c3682a88d6c3b055050c0a180f9ceb985c1a3826318056b62dd6d2859a2a23eba7aad4bf26404327d5479bde98658745fa7d88efa
-DIST podman-4.4.1.tar.gz 14396828 BLAKE2B 
4d5ff7d14fc3cbf5fce4b86bda81abfe2575f090820cd020b3c473aa46849dacf56986ef0a2cc1820536b2e89cddbd1f34d13c4e9338cb95bc9ac6ec25006f79
 SHA512 
33a22b7941f4f6715baa1cd2d5b29a4e2e95264c5239877122448f71e1408d8c393bcd2cdaef9516a580eede911c84f1cfea9d7b4c9d287a2737986fdc604e2c
 DIST podman-4.5.0.tar.gz 17423692 BLAKE2B 
ba28e77626bb4bcdb85b20031e12cf93f2eb3174b678cb8e99557df13e2cdf377ea402eb373a51ea44302f878f8e1cdedda14a2f3ad8c9e88895754fc50c272e
 SHA512 
8a699dc01fc3d7c4a9e5ef4f166170303fc30e0f6695c61f763944e1cb755e75896108e0c4166d184fe49e3a6859f045aa3883047ebba9290e851fc128d77cac

diff --git a/app-containers/podman/podman-4.3.1.ebuild 
b/app-containers/podman/podman-4.3.1.ebuild
deleted file mode 100644
index feeee30c1bc9..000000000000
--- a/app-containers/podman/podman-4.3.1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="814b7b003cc630bf6ab188274706c383f9fb9915"
-
-inherit bash-completion-r1 flag-o-matic go-module tmpfiles
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/";
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-       app-crypt/gpgme:=
-       >=app-containers/conmon-2.0.0
-       cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-       !cgroup-hybrid? ( app-containers/crun )
-       dev-libs/libassuan:=
-       dev-libs/libgpg-error:=
-       >=app-containers/cni-plugins-0.8.6
-       sys-apps/shadow:=
-       sys-fs/lvm2
-       sys-libs/libseccomp:=
-
-       apparmor? ( sys-libs/libapparmor )
-       btrfs? ( sys-fs/btrfs-progs )
-       init? ( app-containers/catatonit )
-       rootless? ( app-containers/slirp4netns )
-       selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-       ${COMMON_DEPEND}
-       dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-       fuse? ( sys-fs/fuse-overlayfs )
-       selinux? ( sec-policy/selinux-podman )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-       default
-
-       # Disable installation of python modules here, since those are
-       # installed by separate ebuilds.
-       local makefile_sed_args=(
-               -e '/^GIT_.*/d'
-               -e 's/$(GO) build/$(GO) build -v -work -x/'
-               -e 's/^\(install:.*\) install\.python$/\1/'
-               -e 's|^pkg/varlink/iopodman.go: .gopathok 
pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: 
pkg/varlink/io.podman.varlink|'
-       )
-
-       has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 
's:GO111MODULE=off:GO111MODULE=on:')
-
-       sed "${makefile_sed_args[@]}" -i Makefile || die
-}
-
-src_compile() {
-       local git_commit=${EGIT_COMMIT}
-
-       # Filter unsupported linker flags
-       filter-flags '-Wl,*'
-
-       [[ -f hack/apparmor_tag.sh ]] || die
-       if use apparmor; then
-               echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-       else
-               echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-       fi
-
-       [[ -f hack/btrfs_installed_tag.sh ]] || die
-       if use btrfs; then
-               echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-       else
-               echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-                       hack/btrfs_installed_tag.sh || die
-       fi
-
-       [[ -f hack/selinux_tag.sh ]] || die
-       if use selinux; then
-               echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-       else
-               echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-       fi
-
-       # Avoid this error when generating pkg/varlink/iopodman.go:
-       # cannot find package "github.com/varlink/go/varlink/idl"
-       mkdir -p _output || die
-       ln -snf ../vendor _output/src || die
-       GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || 
die
-       rm _output/src || die
-
-       export -n GOCACHE GOPATH XDG_CACHE_HOME
-       GOBIN="${S}/bin" \
-               emake all \
-                       GIT_BRANCH=master \
-                       GIT_BRANCH_CLEAN=master \
-                       COMMIT_NO="${git_commit}" \
-                       GIT_COMMIT="${git_commit}"
-}
-
-src_install() {
-       emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-       insinto /etc/containers
-       newins test/registries.conf registries.conf.example
-       newins test/policy.json policy.json.example
-
-       insinto /usr/share/containers
-       doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
-
-       newconfd "${FILESDIR}"/podman.confd podman
-       newinitd "${FILESDIR}"/podman.initd podman
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/podman.logrotated" podman
-
-       dobashcomp completions/bash/*
-
-       insinto /usr/share/zsh/site-functions
-       doins completions/zsh/*
-
-       insinto /usr/share/fish/vendor_completions.d
-       doins completions/fish/*
-
-       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
-
-       local want_newline=false
-       if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e 
${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-               elog "You need to create the following config files:"
-               elog "/etc/containers/registries.conf"
-               elog "/etc/containers/policy.json"
-               elog "To copy over default examples, use:"
-               elog "cp /etc/containers/registries.conf{.example,}"
-               elog "cp /etc/containers/policy.json{.example,}"
-               want_newline=true
-       fi
-       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-4.4.1-r1.ebuild 
b/app-containers/podman/podman-4.4.1-r1.ebuild
deleted file mode 100644
index bfb6c4323abe..000000000000
--- a/app-containers/podman/podman-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="34e8f3933242f2e566bbbbf343cf69b7d506c1cf"
-
-inherit bash-completion-r1 flag-o-matic go-module tmpfiles
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/";
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-       app-crypt/gpgme:=
-       >=app-containers/conmon-2.0.0
-       cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-       !cgroup-hybrid? ( app-containers/crun )
-       dev-libs/libassuan:=
-       dev-libs/libgpg-error:=
-       >=app-containers/cni-plugins-0.8.6
-       sys-apps/shadow:=
-       sys-fs/lvm2
-       sys-libs/libseccomp:=
-
-       apparmor? ( sys-libs/libapparmor )
-       btrfs? ( sys-fs/btrfs-progs )
-       init? ( app-containers/catatonit )
-       rootless? ( app-containers/slirp4netns )
-       selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-       ${COMMON_DEPEND}
-       dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-       fuse? ( sys-fs/fuse-overlayfs )
-       selinux? ( sec-policy/selinux-podman )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-       default
-
-       # Disable installation of python modules here, since those are
-       # installed by separate ebuilds.
-       local makefile_sed_args=(
-               -e '/^GIT_.*/d'
-               -e 's/$(GO) build/$(GO) build -v -work -x/'
-               -e 's/^\(install:.*\) install\.python$/\1/'
-               -e 's|^pkg/varlink/iopodman.go: .gopathok 
pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: 
pkg/varlink/io.podman.varlink|'
-       )
-
-       has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 
's:GO111MODULE=off:GO111MODULE=on:')
-
-       sed "${makefile_sed_args[@]}" -i Makefile || die
-}
-
-src_compile() {
-       local git_commit=${EGIT_COMMIT}
-
-       # Filter unsupported linker flags
-       filter-flags '-Wl,*'
-
-       [[ -f hack/apparmor_tag.sh ]] || die
-       if use apparmor; then
-               echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-       else
-               echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-       fi
-
-       [[ -f hack/btrfs_installed_tag.sh ]] || die
-       if use btrfs; then
-               echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-       else
-               echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-                       hack/btrfs_installed_tag.sh || die
-       fi
-
-       [[ -f hack/selinux_tag.sh ]] || die
-       if use selinux; then
-               echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-       else
-               echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-       fi
-
-       # Avoid this error when generating pkg/varlink/iopodman.go:
-       # cannot find package "github.com/varlink/go/varlink/idl"
-       mkdir -p _output || die
-       ln -snf ../vendor _output/src || die
-       GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || 
die
-       rm _output/src || die
-
-       export -n GOCACHE GOPATH XDG_CACHE_HOME
-       GOBIN="${S}/bin" \
-               emake all \
-                       PREFIX="${EPREFIX}/usr" \
-                       GIT_BRANCH=master \
-                       GIT_BRANCH_CLEAN=master \
-                       COMMIT_NO="${git_commit}" \
-                       GIT_COMMIT="${git_commit}"
-}
-
-src_install() {
-       emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-       insinto /etc/containers
-       newins test/registries.conf registries.conf.example
-       newins test/policy.json policy.json.example
-
-       insinto /usr/share/containers
-       doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
-
-       newconfd "${FILESDIR}"/podman.confd podman
-       newinitd "${FILESDIR}"/podman.initd podman
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/podman.logrotated" podman
-
-       dobashcomp completions/bash/*
-
-       insinto /usr/share/zsh/site-functions
-       doins completions/zsh/*
-
-       insinto /usr/share/fish/vendor_completions.d
-       doins completions/fish/*
-
-       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
-
-       local want_newline=false
-       if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e 
${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-               elog "You need to create the following config files:"
-               elog "/etc/containers/registries.conf"
-               elog "/etc/containers/policy.json"
-               elog "To copy over default examples, use:"
-               elog "cp /etc/containers/registries.conf{.example,}"
-               elog "cp /etc/containers/policy.json{.example,}"
-               want_newline=true
-       fi
-       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