From 0d5f0da4687b8f6544c28ad23c45795fa783b0de Mon Sep 17 00:00:00 2001 From: Jonathan Callen Date: Sat, 4 Apr 2020 18:06:28 -0400 Subject: [PATCH] app-emulation/skopeo: Make btrfs optional Closes: https://bugs.gentoo.org/716236 Signed-off-by: William Hubbs --- 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 c36c37139fad..6027ac0be078 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 41797bfbd1bb..c6caefe701f8 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 -- 2.26.2