From 4151b44b012afdb91ba2b24c0ad1ef2d165bc301 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Sun, 19 Dec 2021 23:27:28 -0800 Subject: Move {app-emulation -> app-containers}/buildah Signed-off-by: Georgy Yakovlev --- app-containers/buildah/Manifest | 2 + app-containers/buildah/buildah-1.21.1.ebuild | 50 +++++++++++++++++++++++ app-containers/buildah/buildah-1.23.1.ebuild | 50 +++++++++++++++++++++++ app-containers/buildah/metadata.xml | 11 +++++ app-emulation/buildah/Manifest | 2 - app-emulation/buildah/buildah-1.21.1.ebuild | 50 ----------------------- app-emulation/buildah/buildah-1.23.1.ebuild | 50 ----------------------- app-emulation/buildah/metadata.xml | 11 ----- profiles/updates/4Q-2021 | 1 + sys-cluster/charliecloud/charliecloud-0.24.ebuild | 2 +- sys-cluster/charliecloud/charliecloud-0.25.ebuild | 2 +- sys-cluster/charliecloud/charliecloud-9999.ebuild | 2 +- 12 files changed, 117 insertions(+), 116 deletions(-) create mode 100644 app-containers/buildah/Manifest create mode 100644 app-containers/buildah/buildah-1.21.1.ebuild create mode 100644 app-containers/buildah/buildah-1.23.1.ebuild create mode 100644 app-containers/buildah/metadata.xml delete mode 100644 app-emulation/buildah/Manifest delete mode 100644 app-emulation/buildah/buildah-1.21.1.ebuild delete mode 100644 app-emulation/buildah/buildah-1.23.1.ebuild delete mode 100644 app-emulation/buildah/metadata.xml diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest new file mode 100644 index 000000000000..ae809d0a5131 --- /dev/null +++ b/app-containers/buildah/Manifest @@ -0,0 +1,2 @@ +DIST buildah-1.21.1.tar.gz 11693142 BLAKE2B 513f75d8f2831130759f3bcb77fad311c28862b82df8866608bd909eea38468a6b576dfad2598725caa9c4e413108ea6ec3557c8a777017cc8a37b5cb16b70a1 SHA512 8fb30ed0948f898aef9a32c34d4b2a2e04a376257a73184ec01b67c770be1c3c87e46987ad001ececf2235cb5e17f9d0ff9e9f34be61ddd0935859c4e5b37d1f +DIST buildah-1.23.1.tar.gz 11872323 BLAKE2B 6e4cffd11177bca6c3e86cd3372fc7bf295b23559b7478a679ea2bea022c149b5ea058224f0a156df1b9511905795c44ed5e988ec68ca834dd80d0c198543d5f SHA512 2ceb6df5adb671483557bb03937df583857d99c116be5d44aae533c155f560d5d454bebf25908ac02bb85e4c2ba31533adb99f0946ecc4f4830977c14f324b6f diff --git a/app-containers/buildah/buildah-1.21.1.ebuild b/app-containers/buildah/buildah-1.21.1.ebuild new file mode 100644 index 000000000000..43eb836a60fb --- /dev/null +++ b/app-containers/buildah/buildah-1.21.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit bash-completion-r1 go-module +GIT_COMMIT=d70e8ae3 + +DESCRIPTION="A tool that facilitates building OCI images" +HOMEPAGE="https://github.com/containers/buildah" +SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${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" +IUSE="selinux" + +RDEPEND="app-crypt/gpgme:= + app-emulation/skopeo + dev-libs/libgpg-error:= + dev-libs/libassuan:= + sys-fs/lvm2:= + sys-libs/libseccomp:= + selinux? ( sys-libs/libselinux:= )" +DEPEND="${RDEPEND}" + +RESTRICT+=" test" + +src_prepare() { + default + [[ -f selinux_tag.sh ]] || die + use selinux || { echo -e "#!/bin/sh\ntrue" > \ + selinux_tag.sh || die; } + sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed' +} + +src_compile() { + emake GIT_COMMIT=${GIT_COMMIT} all +} + +src_install() { + dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md + doman docs/*.1 + dodoc -r docs/tutorials + dobin bin/{${PN},imgtype} + dobashcomp contrib/completions/bash/buildah +} + +src_test() { + emake test-unit +} diff --git a/app-containers/buildah/buildah-1.23.1.ebuild b/app-containers/buildah/buildah-1.23.1.ebuild new file mode 100644 index 000000000000..9f9600071e63 --- /dev/null +++ b/app-containers/buildah/buildah-1.23.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit bash-completion-r1 go-module +GIT_COMMIT=d9a41b85 + +DESCRIPTION="A tool that facilitates building OCI images" +HOMEPAGE="https://github.com/containers/buildah" +SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${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" +IUSE="selinux" + +RDEPEND="app-crypt/gpgme:= + app-emulation/skopeo + dev-libs/libgpg-error:= + dev-libs/libassuan:= + sys-fs/lvm2:= + sys-libs/libseccomp:= + selinux? ( sys-libs/libselinux:= )" +DEPEND="${RDEPEND}" + +RESTRICT+=" test" + +src_prepare() { + default + [[ -f selinux_tag.sh ]] || die + use selinux || { echo -e "#!/bin/sh\ntrue" > \ + selinux_tag.sh || die; } + sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed' +} + +src_compile() { + emake GIT_COMMIT=${GIT_COMMIT} all +} + +src_install() { + dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md + doman docs/*.1 + dodoc -r docs/tutorials + dobin bin/{${PN},imgtype} + dobashcomp contrib/completions/bash/buildah +} + +src_test() { + emake test-unit +} diff --git a/app-containers/buildah/metadata.xml b/app-containers/buildah/metadata.xml new file mode 100644 index 000000000000..f3f28d12b5c5 --- /dev/null +++ b/app-containers/buildah/metadata.xml @@ -0,0 +1,11 @@ + + + + + zmedico@gentoo.org + Zac Medico + + + containers/buildah + + diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest deleted file mode 100644 index ae809d0a5131..000000000000 --- a/app-emulation/buildah/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST buildah-1.21.1.tar.gz 11693142 BLAKE2B 513f75d8f2831130759f3bcb77fad311c28862b82df8866608bd909eea38468a6b576dfad2598725caa9c4e413108ea6ec3557c8a777017cc8a37b5cb16b70a1 SHA512 8fb30ed0948f898aef9a32c34d4b2a2e04a376257a73184ec01b67c770be1c3c87e46987ad001ececf2235cb5e17f9d0ff9e9f34be61ddd0935859c4e5b37d1f -DIST buildah-1.23.1.tar.gz 11872323 BLAKE2B 6e4cffd11177bca6c3e86cd3372fc7bf295b23559b7478a679ea2bea022c149b5ea058224f0a156df1b9511905795c44ed5e988ec68ca834dd80d0c198543d5f SHA512 2ceb6df5adb671483557bb03937df583857d99c116be5d44aae533c155f560d5d454bebf25908ac02bb85e4c2ba31533adb99f0946ecc4f4830977c14f324b6f diff --git a/app-emulation/buildah/buildah-1.21.1.ebuild b/app-emulation/buildah/buildah-1.21.1.ebuild deleted file mode 100644 index 43eb836a60fb..000000000000 --- a/app-emulation/buildah/buildah-1.21.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 go-module -GIT_COMMIT=d70e8ae3 - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah" -SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${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" -IUSE="selinux" - -RDEPEND="app-crypt/gpgme:= - app-emulation/skopeo - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-fs/lvm2:= - sys-libs/libseccomp:= - selinux? ( sys-libs/libselinux:= )" -DEPEND="${RDEPEND}" - -RESTRICT+=" test" - -src_prepare() { - default - [[ -f selinux_tag.sh ]] || die - use selinux || { echo -e "#!/bin/sh\ntrue" > \ - selinux_tag.sh || die; } - sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed' -} - -src_compile() { - emake GIT_COMMIT=${GIT_COMMIT} all -} - -src_install() { - dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md - doman docs/*.1 - dodoc -r docs/tutorials - dobin bin/{${PN},imgtype} - dobashcomp contrib/completions/bash/buildah -} - -src_test() { - emake test-unit -} diff --git a/app-emulation/buildah/buildah-1.23.1.ebuild b/app-emulation/buildah/buildah-1.23.1.ebuild deleted file mode 100644 index 9f9600071e63..000000000000 --- a/app-emulation/buildah/buildah-1.23.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 go-module -GIT_COMMIT=d9a41b85 - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah" -SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${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" -IUSE="selinux" - -RDEPEND="app-crypt/gpgme:= - app-emulation/skopeo - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-fs/lvm2:= - sys-libs/libseccomp:= - selinux? ( sys-libs/libselinux:= )" -DEPEND="${RDEPEND}" - -RESTRICT+=" test" - -src_prepare() { - default - [[ -f selinux_tag.sh ]] || die - use selinux || { echo -e "#!/bin/sh\ntrue" > \ - selinux_tag.sh || die; } - sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed' -} - -src_compile() { - emake GIT_COMMIT=${GIT_COMMIT} all -} - -src_install() { - dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md - doman docs/*.1 - dodoc -r docs/tutorials - dobin bin/{${PN},imgtype} - dobashcomp contrib/completions/bash/buildah -} - -src_test() { - emake test-unit -} diff --git a/app-emulation/buildah/metadata.xml b/app-emulation/buildah/metadata.xml deleted file mode 100644 index f3f28d12b5c5..000000000000 --- a/app-emulation/buildah/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - zmedico@gentoo.org - Zac Medico - - - containers/buildah - - diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021 index 21949a46aa53..0fc5f3b78292 100644 --- a/profiles/updates/4Q-2021 +++ b/profiles/updates/4Q-2021 @@ -33,3 +33,4 @@ move app-crypt/openpgp-keys-voikko sec-keys/openpgp-keys-voikko move app-emulation/docker-proxy app-containers/docker-proxy move app-emulation/containerd app-containers/containerd move app-emulation/crun app-containers/crun +move app-emulation/buildah app-containers/buildah diff --git a/sys-cluster/charliecloud/charliecloud-0.24.ebuild b/sys-cluster/charliecloud/charliecloud-0.24.ebuild index 969b56a74d47..62f2e98e4520 100644 --- a/sys-cluster/charliecloud/charliecloud-0.24.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.24.ebuild @@ -72,7 +72,7 @@ src_configure() { pkg_postinst() { elog "Various builders are supported, as alternative to the internal ch-image." - optfeature "Building with Buildah" app-emulation/buildah + optfeature "Building with Buildah" app-containers/buildah optfeature "Building with Docker" app-emulation/docker optfeature "Progress bars during long operations" sys-apps/pv optfeature "Pack and unpack squashfs images" sys-fs/squashfs-tools diff --git a/sys-cluster/charliecloud/charliecloud-0.25.ebuild b/sys-cluster/charliecloud/charliecloud-0.25.ebuild index 747ab7795f94..b551d449417f 100644 --- a/sys-cluster/charliecloud/charliecloud-0.25.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.25.ebuild @@ -70,7 +70,7 @@ src_configure() { pkg_postinst() { elog "Various builders are supported, as alternative to the internal ch-image." - optfeature "Building with Buildah" app-emulation/buildah + optfeature "Building with Buildah" app-containers/buildah optfeature "Building with Docker" app-emulation/docker optfeature "Progress bars during long operations" sys-apps/pv optfeature "Pack and unpack squashfs images" sys-fs/squashfs-tools diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild index 747ab7795f94..b551d449417f 100644 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild +++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild @@ -70,7 +70,7 @@ src_configure() { pkg_postinst() { elog "Various builders are supported, as alternative to the internal ch-image." - optfeature "Building with Buildah" app-emulation/buildah + optfeature "Building with Buildah" app-containers/buildah optfeature "Building with Docker" app-emulation/docker optfeature "Progress bars during long operations" sys-apps/pv optfeature "Pack and unpack squashfs images" sys-fs/squashfs-tools -- cgit v1.2.3-65-gdbad