gentoo auto-resync : 04:12:2023 - 16:58:27

3 files changed, 0 insertions, 121 deletions

diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index 155aa6a23388..cb1ffee48b1c 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,11 +1,9 @@
-AUX makefile-1.14.0.patch 1677 BLAKE2B 05f9d685f642ebafd963613b5f45bbc8d8b473f59410c633341053ff3302c0c8d6fda18df359d5851992a98c8cce9c0d4e284b45386ecd8868a32d91adab57a7 SHA512 63e699ff3e43a5ab3f9d33f4cf3974211ef1e48e5b28334b586b8444f7315e1bcc9194bdc3b2529277d13dac22265c0f0ac2da94ef75e208f1124983ef6d4b1c
 DIST skopeo-1.10.0.tar.gz 6460856 BLAKE2B b904a161334ef0a3eaaab8c58f0c7e4c507fa68a09f8fa8235e8a9222d48c98874c9ce878a509e2816f210ffb37dbf707ff2653212e1efbd9ad6686efb97e147 SHA512 0d64e7f12a0d10c81074a04b6c74ed6e7213f598013f1ba672c4c696e9dad5827f41f41bb817263bf8606cd051b8e24e7eab65b95d73d8a1c8bbb3eaeb9defdb
 DIST skopeo-1.11.1.tar.gz 8071084 BLAKE2B 2411db318e377cfcfa9a80523c0bd4900201b1c17a4fe0f875dd78033bd4241e6c806816746ef77304e2edbc3737a3b22cfa83b83d65eb3c462cd5437de4e0b8 SHA512 521a2c8ddf629e361340a51d95200ec67bc4fef814e0449b6d679725536ec9448827229d4f993276f084269c2ec73c1b4edf97c0ce29122d950d350ed623a4b9
 DIST skopeo-1.14.0.tar.gz 10548883 BLAKE2B 6ecf54d236405ce59bedf77acc124fa8b3bb12acefa24a679a1d2d85957ddf585b5a6ba163806b8b7b510485d936adbe1afd6eee8c92b267b948f7d78ac83d05 SHA512 59d329036a97cbeca4de20b15d9dd8adacd5201834b26ae5e5c88b05594b2a7101c22da91f22c35c07a98e41afa28f2c7103e660b3847c7f8c9691f27f4c4146
 DIST skopeo-1.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde
 EBUILD skopeo-1.10.0-r1.ebuild 1066 BLAKE2B f55aa099a396fca1f8513786c48929923d7419a08d232ba910d65d325c5f31c2a4fbb43487d3585c36098375687897f07fbd9e7274edeb4e1b7bf5301dba040d SHA512 0109637023cf52163bbdc2a30fbd086f514a5bd77948888ce30a7824cf4472c46f98f6011e9a0302a054578e5bb812d2b495dac041a060bdb26abbbd034c27bc
 EBUILD skopeo-1.11.1.ebuild 1066 BLAKE2B d304dfa99199b32528a24710a716ab757f9670e4b474fd48c5284005a0a01cc457af1d3882572f27aa81eadb058ec495c7dcebf775dec238ae4b44f0d748d0d0 SHA512 14ad618519d078c4f539afdc3595bd80a1fd102e21abd231f71a530de5019557d915a6809ce1cecb7dc1ee6be57ee9a5b12add0fee1fc8d7325fc2f1f567896b
-EBUILD skopeo-1.14.0-r1.ebuild 2097 BLAKE2B 4f25431121f91ecf094f74820c9a948252ecaaa611b824e8b2dcdc6452a3c4de67c0f9dee07585f15cd6c57bb98aae661618f4cbf017b13160161cceb4143030 SHA512 428330a458080957266cc56f9214e25b08f964c20e33534b771a1f83e9812aca5d2d5703991a089258ab035192939669efb9103c88d8aebc7278dc8ac257c328
 EBUILD skopeo-1.14.0-r3.ebuild 1842 BLAKE2B 07f8a536420602ce9e7a5f0ce71bac363011e41442966b9ce47f94b66a10ba909cf181de161f15b0d6be9cc8f3fc2a9c3872d62efe8ca6dc2de34b317e239601 SHA512 5e294302fd6ee1e9c7753b5b99ace199401d806b34bd1391c1953a783e3739c26f2375493127ddde3633e3f576755a7604b5455d88bd440528b9b18ddd58cdf3
 EBUILD skopeo-1.5.1.ebuild 1403 BLAKE2B a4c236cb6248a1551c90683a45247d19d5634ca7e9ca801761953131f73a7bd0058ab5bcea1d7b2593229eb20c6482e2dae833443227467daccef020b23b5f88 SHA512 b163486639a8831eb20db3a5906378485f0aaf3299e815217b1c8a2f4e27ca35af0bda40e6265a7c58107588cab429c0044717666cd22c43e8e21c73a75277dd
 EBUILD skopeo-9999.ebuild 2097 BLAKE2B 4f25431121f91ecf094f74820c9a948252ecaaa611b824e8b2dcdc6452a3c4de67c0f9dee07585f15cd6c57bb98aae661618f4cbf017b13160161cceb4143030 SHA512 428330a458080957266cc56f9214e25b08f964c20e33534b771a1f83e9812aca5d2d5703991a089258ab035192939669efb9103c88d8aebc7278dc8ac257c328
diff --git a/app-containers/skopeo/files/makefile-1.14.0.patch b/app-containers/skopeo/files/makefile-1.14.0.patch
deleted file mode 100644
index ee3383925a2b..000000000000
--- a/app-containers/skopeo/files/makefile-1.14.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# Patch by Rahil Bhimjiani (IRC: rahilarious) (rahil3108@gmail.com)
-#
-# Rationale behind this patch:
-# 1. We don't install these files (policy.json default.yaml) as part of skopeo because podman, buildah, et. al need them as well, and there's no need for those to depend on skopeo just for configuration. Rely on app-containers/containers-common which has them split out instead. See https://bugs.gentoo.org/849863
-# 2. Remove install-*: because it tries to (re)compile stuff (which we already built in src_compile) on install commands. src_install should only install, not compile
-#
-#
---- a/Makefile
-+++ b/Makefile
-@@ -158,23 +158,20 @@
- 	rm -rf bin docs/*.1 completions/
- 
- install: install-binary install-docs install-completions
--	install -d -m 755 ${DESTDIR}${LOOKASIDEDIR}
- 	install -d -m 755 ${DESTDIR}${CONTAINERSCONFDIR}
--	install -m 644 default-policy.json ${DESTDIR}${CONTAINERSCONFDIR}/policy.json
- 	install -d -m 755 ${DESTDIR}${REGISTRIESDDIR}
--	install -m 644 default.yaml ${DESTDIR}${REGISTRIESDDIR}/default.yaml
- 
--install-binary: bin/skopeo
-+install-binary:
- 	install -d -m 755 ${DESTDIR}${BINDIR}
- 	install -m 755 bin/skopeo ${DESTDIR}${BINDIR}/skopeo
- 
--install-docs: docs
-+install-docs:
- ifneq ($(DISABLE_DOCS), 1)
- 	install -d -m 755 ${DESTDIR}${MANDIR}/man1
- 	install -m 644 docs/*.1 ${DESTDIR}${MANDIR}/man1
- endif
- 
--install-completions: completions
-+install-completions:
- 	install -d -m 755 ${DESTDIR}${BASHINSTALLDIR}
- 	install -m 644 completions/bash/skopeo ${DESTDIR}${BASHINSTALLDIR}
- 	install -d -m 755 ${DESTDIR}${ZSHINSTALLDIR}
- 	install -m 644 completions/zsh/_skopeo ${DESTDIR}${ZSHINSTALLDIR}
- 	install -d -m 755 ${DESTDIR}${FISHINSTALLDIR}
diff --git a/app-containers/skopeo/skopeo-1.14.0-r1.ebuild b/app-containers/skopeo/skopeo-1.14.0-r1.ebuild
deleted file mode 100644
index b7a859d817d5..000000000000
--- a/app-containers/skopeo/skopeo-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-DESCRIPTION="Work with remote container images registries"
-HOMEPAGE="https://github.com/containers/skopeo"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
-else
-	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-# main
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs device-mapper rootless"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
-	rootless? ( sys-apps/shadow:= )
-"
-
-# TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source
-# 	dev-libs/libgpg-error:=
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-containers/containers-common
-"
-BDEPEND="dev-go/go-md2man"
-
-RESTRICT="test"
-PATCHES=(
- "${FILESDIR}"/makefile-1.14.0.patch
-)
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	use device-mapper && CONFIG_CHECK+=" ~MD"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	local file
-	for file in btrfs_installed_tag btrfs_tag libdm_tag libsubid_tag; do
-		[[ -f hack/"${file}".sh ]] || die
-	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
-
-	cat <<-EOF > hack/libdm_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex device-mapper echo "echo libdm_no_deferred_remove exclude_graphdriver_devicemapper")
-	EOF
-
-	cat <<-EOF > hack/libsubid_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex rootless "echo libsubid" echo)
-	EOF
-}
-
-src_compile() {
-	# export variables which 'make install' is also going to use
-	export PREFIX="${EPREFIX}/usr" \
-		   CONTAINERSCONFDIR="${EPREFIX}/etc/containers"
-	# compile binary, docs, completions
-	emake all completions
-}