commit: 79878efeaa235aa4757cee3d848fc5a53a53f429 Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks> AuthorDate: Mon Jul 7 13:01:21 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Jul 8 03:53:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79878efe
app-containers/skopeo: remove 1.15 & 1.17 Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks> From: https://github.com/gentoo/gentoo/pull/42919 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-containers/skopeo/Manifest | 2 - app-containers/skopeo/metadata.xml | 1 - app-containers/skopeo/skopeo-1.15.1.ebuild | 69 ------------------------------ app-containers/skopeo/skopeo-1.17.0.ebuild | 69 ------------------------------ 4 files changed, 141 deletions(-) diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest index 9d5af7e482c1..499a3bfa86c5 100644 --- a/app-containers/skopeo/Manifest +++ b/app-containers/skopeo/Manifest @@ -1,4 +1,2 @@ -DIST skopeo-1.15.1.tar.gz 10709125 BLAKE2B aa688197fe0d803b6cb1f4e7c5c998a917e7d588fa41b9e6ede6d60fd1ef12f209e2f119bc29143bf92ae3349c1168e33f79cb36d6c7f5a1a22bcbf3f4e51792 SHA512 686d17da4a84d9029d688cfca08724576564ce2a05aed9380bf55059c244c90cffa3b21c2dbe84b19b746773e98d5f26e5ceaca58f7be26b656125977685c663 -DIST skopeo-1.17.0.tar.gz 10682765 BLAKE2B 88e658a29bacaead26ef19309e2c138d5b689c04b56291a93f23765a97bcee0e3acfa82014babd5cf375127b78cc3ac4fb42b6ba3284632d43b1ac865a618969 SHA512 72cee72a88764a85252ff1812aff284215805db10708fdfd4f3c778d7efec16b8a0d4d26b966a2e18ca36eea9a98265d75e78967dfb3ea0bf94f98c3b61c6504 DIST skopeo-1.18.0.tar.gz 10790607 BLAKE2B ebbd9c481fd9ae03ff853042276037a521a7911ded67006faa1b11d6a70affadce35bdcea67209250cde36196ae87f1206ba654f9a52c7ec833cb25fe6c0af1e SHA512 7d56d78b4e0299c187eb2ea46a2d6ac41a4ad30848e9f5fe43285af74c5207f6fc4ee98c15bd5114de7a660e52846f75c26632ae1aa3ccf656b504798a6b1d56 DIST skopeo-1.19.0.tar.gz 10819827 BLAKE2B c413bdc58634e144bcd1ee64afcba5cbd472fb08791c6eb8acb1cc84fdc9a62ef16fcd52123ac3364b1473f2aa285b97007d440b99385f8503120b412294f17c SHA512 2e297a193e8414f0482b06b7e2aaa027c4510963e91e4675c00b8113e58b82abf26943f36a60584dc47fd7f3abd80c452fb9c92f29e1b82d4c329bd422a399ee diff --git a/app-containers/skopeo/metadata.xml b/app-containers/skopeo/metadata.xml index 59cd39c52a42..6ea400ab9211 100644 --- a/app-containers/skopeo/metadata.xml +++ b/app-containers/skopeo/metadata.xml @@ -15,7 +15,6 @@ </maintainer> <use> <flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag> - <flag name="device-mapper">Compiles with libdevmapper</flag> <flag name="rootless">Compiles with libsubid</flag> </use> <upstream> diff --git a/app-containers/skopeo/skopeo-1.15.1.ebuild b/app-containers/skopeo/skopeo-1.15.1.ebuild deleted file mode 100644 index 462b948cd231..000000000000 --- a/app-containers/skopeo/skopeo-1.15.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2023-2024 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" - -pkg_setup() { - use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - use device-mapper && CONFIG_CHECK+=" ~MD" - linux-info_pkg_setup -} - -run_make() { - emake \ - BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" \ - CONTAINERSCONFDIR="${EPREFIX}/etc/containers" \ - LIBDM_BUILD_TAG="$(usex device-mapper '' 'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" \ - LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \ - PREFIX="${EPREFIX}/usr" \ - $@ -} - -src_compile() { - run_make all completions -} - -src_install() { - # The install target in the Makefile tries to rebuild the binary and - # installs things that are already installed by containers-common. - dobin bin/skopeo - einstalldocs - doman docs/*.1 - run_make "DESTDIR=${D}" install-completions -} diff --git a/app-containers/skopeo/skopeo-1.17.0.ebuild b/app-containers/skopeo/skopeo-1.17.0.ebuild deleted file mode 100644 index 1e31e65d7604..000000000000 --- a/app-containers/skopeo/skopeo-1.17.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2023-2025 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" - -pkg_setup() { - use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - use device-mapper && CONFIG_CHECK+=" ~MD" - linux-info_pkg_setup -} - -run_make() { - emake \ - BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" \ - CONTAINERSCONFDIR="${EPREFIX}/etc/containers" \ - LIBDM_BUILD_TAG="$(usex device-mapper '' 'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" \ - LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \ - PREFIX="${EPREFIX}/usr" \ - $@ -} - -src_compile() { - run_make all completions -} - -src_install() { - # The install target in the Makefile tries to rebuild the binary and - # installs things that are already installed by containers-common. - dobin bin/skopeo - einstalldocs - doman docs/*.1 - run_make "DESTDIR=${D}" install-completions -}
