summaryrefslogtreecommitdiff
path: root/app-emulation/buildah
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/buildah')
-rw-r--r--app-emulation/buildah/Manifest19
-rw-r--r--app-emulation/buildah/buildah-1.3-r1.ebuild64
-rw-r--r--app-emulation/buildah/buildah-1.4.ebuild56
-rw-r--r--app-emulation/buildah/buildah-1.5.ebuild56
-rw-r--r--app-emulation/buildah/buildah-1.6.ebuild56
-rw-r--r--app-emulation/buildah/buildah-1.7.1.ebuild56
-rw-r--r--app-emulation/buildah/buildah-1.7.3.ebuild56
-rw-r--r--app-emulation/buildah/buildah-1.8.3.ebuild (renamed from app-emulation/buildah/buildah-1.7.ebuild)5
-rw-r--r--app-emulation/buildah/metadata.xml2
9 files changed, 7 insertions, 363 deletions
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index ff114e372131..2d76bef6cf78 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,18 +1,5 @@
-DIST buildah-1.3-issue-966-containers-storage-c7ba5749d44a65fde2daf114c16fb0272d82d73b.patch 4507 BLAKE2B 85a02751a91a73f1f99a1ae138e712304feeb46a40c792f4ec4ac895ce074d15eab4d76bf5e9be759254d0a023371c074a633607a689b42d238ac3f32b4e1d3d SHA512 63c74989dc649582170fc6657c9bfc805bcec6c4aa31017d53c4fa0f86acf00986adf05a8101605963eb3a358d237aad43c124ebcb5be635cff85efe4aa1eaa4
-DIST buildah-1.3.tar.gz 4486873 BLAKE2B 35fb62626d2466495da47579cf4ab23603797ef42a9308245fa97c87a91fcb978f4d02724ce79c2b4ac620d9868ca8974e4701ba6a96ccf739e5ccb4e6d9693a SHA512 c8e161254495cb652caf9a54a051155008e41575487d26aacd38355f0a447ae0e8973b33a978e6a2d5a6c8105400d49dae46878c5f3631ab51aa3556d5033ccd
-DIST buildah-1.4.tar.gz 4529960 BLAKE2B 20878d322d75c6c7c2921f91a9d5434231456d2e6a94c1d4b9ca4fc068bcde1359ba0113dbf97c05738e328933068cbe2a101a1fb429e602533a42a94282a840 SHA512 8b7fc6e94da3615ce42a13621f766602465404f30c7e4e0fcb50998aefb59ebd50a4e000b8b3887e150656a2dd8b8fb3541991f8cac1193322e828448b89056d
-DIST buildah-1.5.tar.gz 4549438 BLAKE2B 0b547f2e06a012540e633e3e55d12d5f44141be7e7231643efd1914571b0d3b03411b5d95f2b8e616679c1f8c966fda818ac8d2a2ca016e89218480ca1c9392c SHA512 291bf7d174500e96279f7fba143f72349648b09fd2d100e6409ae75c8436ff323143ed5b8b1a3448865171916bd44790292344247f0579c33a72c1ff774631e5
-DIST buildah-1.6.tar.gz 6296936 BLAKE2B 1c5e0b1a8d3f3be381c0b7cad5c52af95ee8977c46500e24888bda3f33fffead493b53deb6bbec879d342639fbaab69acbbf0186d7794f6261b3a81b958475e9 SHA512 fb946351602370ecadce84bddde9b8c954b5ecd1ed88f75db8335bf3b5cb0fc68b90a253433d51ddab04d32a6ec2e87d48282f51ec2c3965410533f1247e96f0
-DIST buildah-1.7.1.tar.gz 5048407 BLAKE2B e76cbc95ce835eaa26d53f6ce74b9bbb0d4d5683f91bdaf090158ffdc3d223a522a825af2d99d573a5c3cd57445b4d7c3d4aff359454beac81244821367ab3d7 SHA512 4b62a604dcae7a8fd0a1d74186c6f5d4a5288072b014d51d929f68442436e774428b99e62a78504314cbec517254f29d79294dc6c0b30a999788c9af12d0be01
-DIST buildah-1.7.3.tar.gz 5083873 BLAKE2B d366657c02c475bd57cdcd29cf3341098c2855af834a9aa97f41b8950ff1dd29ca0fcfed093a980e67e9c1a2ccb76e819386560a48943ebd6abc106e2a4270ea SHA512 492a4bf054f00d7da3b9edc6ce8e68497adca74895561db7025acfcd3767baac1e4acbabffedafd8becf15f884635f42c699bd57370238feacf4bded51565a75
-DIST buildah-1.7.tar.gz 5041530 BLAKE2B 5a30cd75783448cfc0df8167406669c1b687781e819513c11d2941087aa4ccc1b87f10acc6e4a77de5dc991435640aefd6139ee9bb66e5952de63d1593b6fab9 SHA512 fb44787b59c4ba26bc9b38ba434c6eeebbdeeeb3d28d44819bfe05c42e1a8db63e41d75382d8f25c2c72b44c7512dd5f5b7f3e4838afa40fb67037616594f8c0
DIST buildah-1.8.2.tar.gz 5102103 BLAKE2B 2e19f8af15e5f4a3c6488a44cc0f51592bc6f5201f217ea814daf4b08691f08170debfa2de01d39ae20c6289ed0915383b958cd5e59d8b598d867053ee990af2 SHA512 0cb8dc62c4139a5b500d4021b05344c70c1ec86ff9850bcca87011ad522fe95981d373d73b30b7899959876d78cd15e565e034cf136aa271a72fa4810ff34cae
-EBUILD buildah-1.3-r1.ebuild 2054 BLAKE2B 0451a2f5b941d833d4df6568bd0cfbbe631c80bd17d76c13fad1c522997957656f6133b030ee005c1f2c107188d2f24fc22b48af971065a096ba2c5025e9e994 SHA512 e5d7586db5cd9b3af24c04a147ec48d3d000dc73910fcd4222b44df94d02a92ebb37bd4cc2cc71b65dc9f452208033a5ac4633fe042fadc103b1e503bebfd865
-EBUILD buildah-1.4.ebuild 1412 BLAKE2B 8ba820689066f0b078e2c19e5571275d2b9963f5ffeb5a1ceb09294da665aaf8defd025f0fa993d7cc5c0fdac5297ce74ee08ab4c6a061a7dc1967b1a8d8c981 SHA512 c679acd2f7a02d2dab0c3b87b4a919be7e1474cc72a2b3d184d153420134d5ae8e3a7748180d181f25c203a2b3fb125b3c5adfa4f2d1e8691dfe29b50f1829b9
-EBUILD buildah-1.5.ebuild 1412 BLAKE2B 8ba820689066f0b078e2c19e5571275d2b9963f5ffeb5a1ceb09294da665aaf8defd025f0fa993d7cc5c0fdac5297ce74ee08ab4c6a061a7dc1967b1a8d8c981 SHA512 c679acd2f7a02d2dab0c3b87b4a919be7e1474cc72a2b3d184d153420134d5ae8e3a7748180d181f25c203a2b3fb125b3c5adfa4f2d1e8691dfe29b50f1829b9
-EBUILD buildah-1.6.ebuild 1412 BLAKE2B 511b9dde818042cfbe49bc07d161888ea3383f80b87d5afe6c649b70cee0228c8b617d1bcac7f5e84b9a021f9c3a369251e2b0abaedbb2e0d6b568413da0d3c8 SHA512 cbfc5c4725b6323f34b52828e4511aeffd150fb239de9f129f15b61af7771d56a78eefef0608260e10971a17fe71ead658a4142cf4b12b2071a4057a636cab87
-EBUILD buildah-1.7.1.ebuild 1445 BLAKE2B e6316ea435fc2939c36911ce2b4b8cb7ea7ce39184fbc41b7a7812bd862c9d63dd77304774bfdc6dba64b153037451ea1d7df34cb47f2fb34241db18db5bf1b7 SHA512 bef66d51ea66af068b3f62cc085eb03142d8062e92f4b3e4ad8bdab63bd9a839318b6fda354ca290230c2a59b8234e5cc32a255f499bee96a5829f07d694f612
-EBUILD buildah-1.7.3.ebuild 1445 BLAKE2B be5ee08e333c3176a7b8d12320df4c066ed79e01ef41ca5d7614416bfa023b1f4c4ac08dcb6efec3fbe1f634e4a4ef764c2de42f45f19619a0754232ab3af307 SHA512 23b89c68496a9d918199408eb67e19161d71fbea6f1196be33af93e385c6dfe8146b063288f8ae4f0e088307769e2defb9b4aba1e3601755bcc5f07063e67a31
-EBUILD buildah-1.7.ebuild 1412 BLAKE2B 799ca0da805e15f418189b6b82084f94c3e47fce4ae6ee3dbabf9fcc4d0f79d2b3d6db9017ebd6c203d3ca9c437623fa6e08af255410796ca423e94cb574dd62 SHA512 14cc66b762cd3370ea5f21085db4d69ded6ddeb64cfe469b457436946e253ec135fce320a60c54a4edd2cdd7a3277c6b937f80faae662df832f1ce807d8c3647
+DIST buildah-1.8.3.tar.gz 5114332 BLAKE2B 55ef5e10e8a2a2b95ef8f8cd28a3ccdb3e734fc3ef64a890900e20a5b8994f92571e2cdec875813203fc4e98a8c4f09656d16bc4c6242194131a25713e054492 SHA512 f875c448f81ef272ad0b7be9c1579d6650983fed4e471095cd645ae1126b49d91ec15b55a072e722205154b681eefc0fb32f5a452d827e875eb0c4779f5d712b
EBUILD buildah-1.8.2.ebuild 1446 BLAKE2B 7aa85e0524562984a193be82821bab78f0c14815837f734ce98453db951e0c79f876c539c8421ea6d76daa7a7d2689b8f523877d3cae3f89df667c2cb4537e7d SHA512 ce3dd70e54209634f4e21202ed766fe43bcf7ea8bdb049efc10b4ebbd7a08221ada5804d28651f2bdbce6fc788b415f1967da306037600723affab02105737bf
-MISC metadata.xml 433 BLAKE2B 5b06389433033a1cf28f5fcae5dd41f4ebe0582d9537e8e163fad82046a66477a6ac3ed26ea63e60ea392919afcd3f0f45ae8ddabefd3a518707d5adff04e9d6 SHA512 3ab67ceda6ca0c8bd10f8868172d9686c8eeaa856760453be1c3ba907abb734ba37f5e9885547a16f69c67aa8d96e576de1ddf3208c08f4d44c2d90b081c74a6
+EBUILD buildah-1.8.3.ebuild 1446 BLAKE2B 9ddb64e07413b5affd6a4d6c0e8f59b96308fe9d3041228177b95de23070ee487dfb8b1a4ac70235f986c7542d06ba2dc38a1868d2c2ae913df52f0a1d9a5665 SHA512 e6b6bb15847ee1174e2299767fba88b504965ef1ef55bf9c8c7129959921c6b5f2b0e56d074a50def15d4b22abbef139b7c90bf1340c84703464e318525f123b
+MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
diff --git a/app-emulation/buildah/buildah-1.3-r1.ebuild b/app-emulation/buildah/buildah-1.3-r1.ebuild
deleted file mode 100644
index ff5716f00454..000000000000
--- a/app-emulation/buildah/buildah-1.3-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/projectatomic/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="4888163"
-CONTAINERS_STORAGE_PATCH=c7ba5749d44a65fde2daf114c16fb0272d82d73b.patch
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
- https://github.com/containers/storage/commit/${CONTAINERS_STORAGE_PATCH} -> buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}"
-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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
- # Apply "layer not known" corruption fix for https://github.com/projectatomic/buildah/issues/966.
- sed 's:[ab]/:\0vendor/github.com/containers/storage/:g' < \
- "${DISTDIR}/buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}" > \
- "${T}/buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}" || die
- eapply "${T}/buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}"
-
- default
- sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
- [[ -f ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
- ostree_tag.sh || die; }
-
- [[ -f selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- selinux_tag.sh || die; }
-}
-
-src_compile() {
- GOPATH="${WORKDIR}/${P}" emake all
-}
-
-src_install() {
- dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
- doman docs/*.1
- dodoc -r docs/tutorials
- dobin ${PN} imgtype
- dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
- GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.4.ebuild b/app-emulation/buildah/buildah-1.4.ebuild
deleted file mode 100644
index e7973d09207b..000000000000
--- a/app-emulation/buildah/buildah-1.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="608fa84"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
- default
- sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
- [[ -f ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
- ostree_tag.sh || die; }
-
- [[ -f selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- selinux_tag.sh || die; }
-}
-
-src_compile() {
- GOPATH="${WORKDIR}/${P}" emake all
-}
-
-src_install() {
- dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
- doman docs/*.1
- dodoc -r docs/tutorials
- dobin ${PN} imgtype
- dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
- GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.5.ebuild b/app-emulation/buildah/buildah-1.5.ebuild
deleted file mode 100644
index e7973d09207b..000000000000
--- a/app-emulation/buildah/buildah-1.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="608fa84"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
- default
- sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
- [[ -f ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
- ostree_tag.sh || die; }
-
- [[ -f selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- selinux_tag.sh || die; }
-}
-
-src_compile() {
- GOPATH="${WORKDIR}/${P}" emake all
-}
-
-src_install() {
- dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
- doman docs/*.1
- dodoc -r docs/tutorials
- dobin ${PN} imgtype
- dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
- GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.6.ebuild b/app-emulation/buildah/buildah-1.6.ebuild
deleted file mode 100644
index 64ef1d8793e7..000000000000
--- a/app-emulation/buildah/buildah-1.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="5f95bd9"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
- default
- sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
- [[ -f ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
- ostree_tag.sh || die; }
-
- [[ -f selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- selinux_tag.sh || die; }
-}
-
-src_compile() {
- GOPATH="${WORKDIR}/${P}" emake all
-}
-
-src_install() {
- dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
- doman docs/*.1
- dodoc -r docs/tutorials
- dobin ${PN} imgtype
- dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
- GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.7.1.ebuild b/app-emulation/buildah/buildah-1.7.1.ebuild
deleted file mode 100644
index b70628774159..000000000000
--- a/app-emulation/buildah/buildah-1.7.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="93747b1"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
- default
- sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
- [[ -f ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
- ostree_tag.sh || die; }
-
- [[ -f selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- selinux_tag.sh || die; }
-}
-
-src_compile() {
- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" emake all
-}
-
-src_install() {
- dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
- doman docs/*.1
- dodoc -r docs/tutorials
- dobin ${PN} imgtype
- dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
- GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.7.3.ebuild b/app-emulation/buildah/buildah-1.7.3.ebuild
deleted file mode 100644
index e537d8b92324..000000000000
--- a/app-emulation/buildah/buildah-1.7.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="2941f34"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
- default
- sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
- [[ -f ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
- ostree_tag.sh || die; }
-
- [[ -f selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- selinux_tag.sh || die; }
-}
-
-src_compile() {
- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" emake all
-}
-
-src_install() {
- dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
- doman docs/*.1
- dodoc -r docs/tutorials
- dobin ${PN} imgtype
- dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
- GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.7.ebuild b/app-emulation/buildah/buildah-1.8.3.ebuild
index 47dd102aac4a..0b435ee4967a 100644
--- a/app-emulation/buildah/buildah-1.7.ebuild
+++ b/app-emulation/buildah/buildah-1.8.3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit bash-completion-r1 golang-vcs-snapshot
KEYWORDS="~amd64"
@@ -12,7 +12,7 @@ SLOT="0"
IUSE="ostree selinux"
EGO_PN="${HOMEPAGE#*//}"
EGIT_COMMIT="v${PV}"
-GIT_COMMIT="873f001"
+GIT_COMMIT="547bd9a"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
RDEPEND="app-crypt/gpgme:=
app-emulation/skopeo
@@ -40,6 +40,7 @@ src_prepare() {
}
src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
GOPATH="${WORKDIR}/${P}" emake all
}
diff --git a/app-emulation/buildah/metadata.xml b/app-emulation/buildah/metadata.xml
index e09086fd802c..aef68f1e5381 100644
--- a/app-emulation/buildah/metadata.xml
+++ b/app-emulation/buildah/metadata.xml
@@ -11,6 +11,6 @@
</flag>
</use>
<upstream>
- <remote-id type="github">projectatomic/buildah</remote-id>
+ <remote-id type="github">containers/buildah</remote-id>
</upstream>
</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 14:27:25 +0000