gentoo auto-resync : 04:10:2022 - 07:16:51

9 files changed, 53 insertions, 128 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index d531fc6bebfb..99c16fdeb854 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 0d1756031767..4ff94da16782 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,3 +1,5 @@
 DIST buildah-1.27.1.tar.gz 14825932 BLAKE2B bf290eeb4d96d255c7cdaa07af49eff44191664ac7dee255c7979656383daaa93c3673ba82ac1cbff033de769ffa08ad027f5d91c81b08a36222cb73e8a1e399 SHA512 a5e2ddf837e613554ffe8fe9c15ac9c8f9c2564c403e5544df7fb8802962581fb4e9dd4361c28c93443ede74c20c82f1631990e443c7895a3b4c3b8a659ee05a
+DIST buildah-1.28.0.tar.gz 14579386 BLAKE2B effc7d0a154e30790585c19e19655f98026c34687e79b91777700bc2f387b96896d88855cd5ec34573dd2678e4a30a832c39f789d53b61b45cb5f682dacd252e SHA512 f5e82a22648fa0d0ba7f5dcf3b97a2ec1182f31d3e03cd2624e01fe76fcdddf0a5605c59816eeef6401d151864b6b6be493c144b83f5667ab3947eea902f0086
 EBUILD buildah-1.27.1.ebuild 1196 BLAKE2B b9b0c03282cd8d03a88649c1156361c8eaf64009147a8f78b9f9f7ab7c72dbb3d340221bc73e36ea1478d46a72e6c57622451c34b8e7f511fba93554dd0afdb7 SHA512 2c64885a361dbe355b5d8cfce1e9febc223fd1331dc3e7358f9f32f2281e8992d00c74de2337aafde4aab6473bfdd2a67aaab7597de8904bca2ad913c060b6a7
+EBUILD buildah-1.28.0.ebuild 1198 BLAKE2B 3c5a4ddabe6075badd8595d46c9f12764e173690fb5cfc67cb5a2e60cf8bc3dbce1d6d05d548a41740cf346e9498313c05497d4a71632848d60b6eb3d9d740ac SHA512 128aae74d0c13b6ec7a9cf7a2c3b09cefd13606ab4c685d72d85bca6f36723943a08918d315dc3f8328c622bdde2fd099fa3bce35db99e297c44e802c97d9df9
 MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f
diff --git a/app-containers/buildah/buildah-1.28.0.ebuild b/app-containers/buildah/buildah-1.28.0.ebuild
new file mode 100644
index 000000000000..2b234b883551
--- /dev/null
+++ b/app-containers/buildah/buildah-1.28.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=79f41e32
+
+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-containers/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+	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/docker-registry/Manifest b/app-containers/docker-registry/Manifest
index d3e1198a5ee7..270750f940ee 100644
--- a/app-containers/docker-registry/Manifest
+++ b/app-containers/docker-registry/Manifest
@@ -3,8 +3,6 @@ AUX registry.confd 85 BLAKE2B 0997c1ad7ee8fc165a87cfebeea75694487c8d8b62130fb19f
 AUX registry.initd 606 BLAKE2B ed8af2651d91be13578edb561c067cfd3e72dfe42a6111be8930d61f233248b7364659a8db5a9800eaa167d76a8b2daf9d121970622de235e61fa0f10ad85174 SHA512 af7780264d068adcd0d6a6768b88ab43c26081b71d1ebd591ca6d175e413cdeee935a6f50d9833775690f0b47daadcc33286f86fb5eb98d2e674b225122aabce
 AUX registry.logrotated 89 BLAKE2B c16fab4c6a3c4fd9f48370ae30505408a49e07c2a7ea7fc119717efcd840ad489c92855e27a5546219b3cdeb257642eb65abc2d544859295688925ae2e94ecb3 SHA512 f824b33a1fa38802a8aa79599843b0ea065603799823352e9515c50bfc61c43a03e9eb5327f9c687b8c3864fc633ad1a46bff9e91f4c54a46a09e67d2f6f833b
 AUX registry.service 323 BLAKE2B 1be481d08a283793d10ef870fc299e1c284087878e67ec54f44e662c616127bc411fdde19659cf7acd69787054c624c5c5206434c36b4e5a0fcceaf79c2e78f0 SHA512 67d2b69c1fc497774e3171628fa73b9b9521e19c76414e32721994f2ba614bd3c6896c578c9d9b8af0ad4972b9da0c504ef787a7585a550be4bfe1bd40eafc15
-DIST docker-registry-2.7.1.tar.gz 1996699 BLAKE2B 2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e SHA512 f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754
 DIST docker-registry-2.8.1.tar.gz 2007611 BLAKE2B abf3e630652f195cf3ad4d07e6d9845000e79d340b0bb8046528bb62592df754c125fd38a92d1af27d068fcd51910f80f356d6a894cb1b97f28d7042af24b898 SHA512 b9c8525051458ff4bf4592ca3ddba83c4325e88c6812ddb28c1567e331c1571f112e3b646ca970f0fe420f3b1d61d00f7151450d7b9948a08733606255731266
-EBUILD docker-registry-2.7.1-r1.ebuild 1463 BLAKE2B 21bbb8b8842540b479e22f7b7e5ce6c2c0f4f4c5ac37a64718c87c6abdef2a550b97ed495d35360d92d9545fe003656366713b27eff9b217859f83aaf834d48c SHA512 da38b17318bc05a0de3980dc1e4815dee8b459dab435993ac2b94c75a1fecfbbcd855c04809627e5d08b477a8bfe381425bdb9f85c6ff5558316e44b65fed80b
 EBUILD docker-registry-2.8.1.ebuild 1463 BLAKE2B c955696e29c7bc97db1849a9abe1716d69db7d68610b29640e3aa9d924ce29da11434bcf71a4b47620980eff01db584750d8ff715b770aef51f73fc525bc3a4b SHA512 c24c19f94c247eaeb0d64c12614deab73b8992727e580277c62c91228a4b12c2cf0261dcf35e00c616996ae61e3d8539b7269d3629cf985f6ba7f273568e5732
 MISC metadata.xml 311 BLAKE2B 16d2abf82e5ae5b180aa81a3d5e1f0f7f638b30d9a5053443af8d512d8094d5923d0a74f58cdc77d6c209128669eaadde427ff50309d37fa275b643887d0df70 SHA512 b574810da841eb8b0f9e48a1f013e7e3705097f2ea6f9a255e57d8ce2800f1b507b5cdbdcf0ffedc339227f8dac9d37fb2ae4bb39cd91895f82674f246a432e3
diff --git a/app-containers/docker-registry/docker-registry-2.7.1-r1.ebuild b/app-containers/docker-registry/docker-registry-2.7.1-r1.ebuild
deleted file mode 100644
index 78708f327413..000000000000
--- a/app-containers/docker-registry/docker-registry-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot systemd
-
-EGIT_COMMIT="2461543d988979529609e8cb6fca9ca190dc48da"
-EGO_PN="github.com/docker/distribution"
-
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-DEPEND="
-	acct-group/registry
-	acct-user/registry
-"
-RDEPEND="${DEPEND}"
-
-SVCNAME="registry"
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}"/${PN}-2.7.0-notification-metrics.patch
-	sed -e "s/git describe.*/echo ${PV})/" \
-		-e "s/git rev-parse.*/echo ${EGIT_COMMIT})/" \
-		-e "s/-s -w/-w/" \
-		-i Makefile || die
-	popd || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #681072
-	GOPATH="${S}" GO_BUILD_FLAGS="-v" emake -C src/${EGO_PN} binaries
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe src/${EGO_PN}/bin/*
-	insinto /etc/docker/registry
-	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/log/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/log/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
diff --git a/app-containers/go-secbench/Manifest b/app-containers/go-secbench/Manifest
index 57468b72516c..747524030866 100644
--- a/app-containers/go-secbench/Manifest
+++ b/app-containers/go-secbench/Manifest
@@ -1,4 +1,3 @@
 DIST go-secbench-0.1.0.tar.gz 1281488 BLAKE2B 83bb27a2113a5e851db8b61402d967d528c9e3b39d249a23b4d28c21e001276eff73f61c6aba610f0020f22de26b04286a91e5a3785b5a9e019d2701d6081f92 SHA512 4712ef56385993ed1e660c1843a1d7e9cd807a3ca8bf935767e8d2965aef25c5b3a7a88d4ed7c072fe124a6b05900bd444cdbc0cee879e80844fb5f695732f2b
 EBUILD go-secbench-0.1.0-r1.ebuild 649 BLAKE2B 9c72d96d1f9f7aead1aa712b3c402ff25425c9a756e0f6a56baff9a8deaa4f56fe707709f204b2b9c18f5db7249c457887c749fbc57d02855d9dd6f6044036c2 SHA512 37a6657879c9e4151e631bae80fada918af0e2a0cbfbd85f671d1ca17b9076a5e413af7f63efdb9d30fe6a3282aa84f15d1519bfea927a2f0ad8c69c6171885e
-EBUILD go-secbench-0.1.0.ebuild 617 BLAKE2B 11385a504928ac66b56ed9efbd96188cba3cb1bcded70f845ff432d65f7ac5ca64c94497c4b1d15fb60f409188d24ac67683fc037ed094a0ee2cab85dd4a0b57 SHA512 101c25a953c19fe5970f53668e19da975c39d1952e58e0a3a8ab1cbe19da432f466074ce7b74a54e8945bf764f3a9a829f788af4603c6f623f08eef3ff2d6d96
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-containers/go-secbench/go-secbench-0.1.0.ebuild b/app-containers/go-secbench/go-secbench-0.1.0.ebuild
deleted file mode 100644
index fdceccf32659..000000000000
--- a/app-containers/go-secbench/go-secbench-0.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/qnib/go-secbench"
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="run and evaluate the docker security benchmark"
-HOMEPAGE="https://github.com/qnib/go-secbench"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-DEPEND="dev-lang/go"
-
-src_compile() {
-	GOPATH="${S}" go build -o bin/go-secbench src/${EGO_PN}/cmd/main.go || die
-}
-
-src_install() {
-	dobin bin/${PN}
-dodoc "src/${EGO_PN}/README.md"
-}
diff --git a/app-containers/umoci/Manifest b/app-containers/umoci/Manifest
index b2bdc62d4b35..c3be40b63f89 100644
--- a/app-containers/umoci/Manifest
+++ b/app-containers/umoci/Manifest
@@ -1,5 +1,3 @@
-DIST umoci-0.2.1.tar.gz 241472 BLAKE2B 2802fcb14e717a6460f9dc06226d3b430cce2181838a32064e86987131317947a4b117e91d11f981fa1df027804dbf2d92472b5c21749783b4f2ed371c699e7e SHA512 dfd7bbd1afd232400a9bffaf6c074d28ce4ce696c9f3c70bd436cc41b96928415d0793d57b1cf34dd70efd7d0e5eb567eaeea65d793c27ff9ea46fb190bd1807
 DIST umoci-0.4.6.tar.gz 2273608 BLAKE2B d5a36c78918697b9c8f54a5c4b914a9124b5e989dff3efc81a9f64f1bd276189d15a565a6ec2e8d4021925017e9a7a17f7cc5359a552f7c57dda414c25d2fb02 SHA512 0614dd583e00b6e2e69256f1ae1d3316e5bb5989a177d18c5ceacf3af18ab82ccf8edef879b6c813855d878d5af53c541ac433d81e6c20796885a26c57564118
-EBUILD umoci-0.2.1.ebuild 921 BLAKE2B caa93ba823c4e8f26d9c65ebeae4f96412dbd47221ccc6a2180ca09ba8ef8ad5bd0bf6a3817547745744657c981b298d2047cd4cc8bfca899cdd254e0aa43159 SHA512 875c57b7d8ba2d7f7485866bc2a12b210505fcbab62abfa901cb5353efc8e77738938cd0380c99b02bd05dd8b34ef2b42e7a23543dfab0925e34580029d40fa9
 EBUILD umoci-0.4.6.ebuild 797 BLAKE2B b79c2ac05f6ed5ae1db9e1d04781a6f46c4f2a17ec8c70db0a3a6e7e5ec96605b480b3a5a8f5386a822b9e68d46bbce34e968dc13930147515d2d0627a9c07b8 SHA512 e3217bb2e870b11ce3ac2e7cf5341193cee6b57dae1b85a33e1ae3ba6499d6f5deb8bf2852a5c9bc92fc2a3500390c5b2dac447cdcbf88310d5e55f27fb433f2
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-containers/umoci/umoci-0.2.1.ebuild b/app-containers/umoci/umoci-0.2.1.ebuild
deleted file mode 100644
index ad66e4afe83d..000000000000
--- a/app-containers/umoci/umoci-0.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/openSUSE/umoci"
-COMMIT=0465f83826bc4f52e6e3c4dbb1022ec5792c421f
-inherit golang-vcs-snapshot
-
-DESCRIPTION="Manipulation tool for OCI images"
-HOMEPAGE="https://github.com/openSUSE/umoci"
-SRC_URI="https://github.com/openSUSE/umoci/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-go/go-md2man"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-RESTRICT="test"
-
-src_compile() {
-	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go build -v -work -x \
-	-ldflags "-w -X main.gitCommit=${COMMIT} -X main.version=${PV}" \
-		-o "bin/${PN}" ./cmd/${PN}
-	echo "$@"
-	"$@" || die
-	cd man
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-dobin bin/${PN}
-doman man/*.1
-dodoc CHANGELOG.md
-einstalldocs
-}