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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CBAFD138350 for ; Sat, 2 May 2020 14:09:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01154E08DD; Sat, 2 May 2020 14:09:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8D63E08DD for ; Sat, 2 May 2020 14:09:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 544B134F0C7 for ; Sat, 2 May 2020 14:08:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C3C2C1D8 for ; Sat, 2 May 2020 14:08:57 +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: <1588428440.0d5f0da4687b8f6544c28ad23c45795fa783b0de.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/skopeo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/skopeo/metadata.xml app-emulation/skopeo/skopeo-0.2.0.ebuild X-VCS-Directories: app-emulation/skopeo/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 0d5f0da4687b8f6544c28ad23c45795fa783b0de X-VCS-Branch: master Date: Sat, 2 May 2020 14:08:57 +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: cf2d5d54-8cd4-4f80-967a-285a32872de2 X-Archives-Hash: 97cac9ecf3ee7a37039442a139019477 commit: 0d5f0da4687b8f6544c28ad23c45795fa783b0de Author: Jonathan Callen gmail com> AuthorDate: Sat Apr 4 22:06:28 2020 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat May 2 14:07:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d5f0da4 app-emulation/skopeo: Make btrfs optional Closes: https://bugs.gentoo.org/716236 Signed-off-by: William Hubbs gentoo.org> app-emulation/skopeo/metadata.xml | 3 +++ app-emulation/skopeo/skopeo-0.2.0.ebuild | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app-emulation/skopeo/metadata.xml b/app-emulation/skopeo/metadata.xml index c36c37139fa..6027ac0be07 100644 --- a/app-emulation/skopeo/metadata.xml +++ b/app-emulation/skopeo/metadata.xml @@ -5,4 +5,7 @@ williamh@gentoo.org William Hubbs + + Enables dependencies for the "btrfs" graph driver. + diff --git a/app-emulation/skopeo/skopeo-0.2.0.ebuild b/app-emulation/skopeo/skopeo-0.2.0.ebuild index 41797bfbd1b..c6caefe701f 100644 --- a/app-emulation/skopeo/skopeo-0.2.0.ebuild +++ b/app-emulation/skopeo/skopeo-0.2.0.ebuild @@ -12,11 +12,12 @@ SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" KEYWORDS="~amd64" +IUSE="btrfs" COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-error:= - >=sys-fs/btrfs-progs-4.0.1 + btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) >=sys-fs/lvm2-2.02.145:=" DEPEND="${COMMON_DEPEND} dev-go/go-md2man" @@ -25,7 +26,8 @@ RDEPEND="${COMMON_DEPEND}" RESTRICT="test" src_compile() { - local BUILDTAGS="containers_image_ostree_stub" + local BUILDTAGS + BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)" set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \ -gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \ -o skopeo ./cmd/skopeo