From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BA3AF158099 for ; Fri, 1 Dec 2023 17:45:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CE682BC024; Fri, 1 Dec 2023 17:45:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFC372BC024 for ; Fri, 1 Dec 2023 17:45:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1B22335D6B for ; Fri, 1 Dec 2023 17:45:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4003213FA for ; Fri, 1 Dec 2023 17:45:03 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1701452694.7d9fe9fd912296eb4890ecce1df360a1b882d6ec.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/skopeo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/skopeo/skopeo-1.14.0-r2.ebuild X-VCS-Directories: app-containers/skopeo/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 7d9fe9fd912296eb4890ecce1df360a1b882d6ec X-VCS-Branch: master Date: Fri, 1 Dec 2023 17:45:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0c0f4562-b11a-42e1-a2bf-57eaab062389 X-Archives-Hash: 5b38152dab8b77ba2e403b0fd095f3e4 commit: 7d9fe9fd912296eb4890ecce1df360a1b882d6ec Author: William Hubbs gentoo org> AuthorDate: Fri Dec 1 17:40:57 2023 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Dec 1 17:44:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9fe9fd app-containers/skopeo: 1.14.0-r2 revbump to fix src_install - drop makefile patch - only install things that are not in app-containers/containers-common Signed-off-by: William Hubbs gentoo.org> app-containers/skopeo/skopeo-1.14.0-r2.ebuild | 69 +++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/app-containers/skopeo/skopeo-1.14.0-r2.ebuild b/app-containers/skopeo/skopeo-1.14.0-r2.ebuild new file mode 100644 index 000000000000..2aed06a521af --- /dev/null +++ b/app-containers/skopeo/skopeo-1.14.0-r2.ebuild @@ -0,0 +1,69 @@ +# 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" + +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) \ + 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 +dodoc README.md + doman docs/*.1 + run_make "DESTDIR=${D}" install-completions +}