From cd4de0a01edf908a178fb37f6da0e6b646ede349 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 Package-Manager: Portage-2.3.95, Repoman-2.3.21 Signed-off-by: Jonathan Callen --- app-emulation/skopeo/metadata.xml | 3 +++ app-emulation/skopeo/skopeo-0.1.41.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 3 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.1.41.ebuild b/app-emulation/skopeo/skopeo-0.1.41.ebuild index cc09b12134e..81a869e5775 100644 --- a/app-emulation/skopeo/skopeo-0.1.41.ebuild +++ b/app-emulation/skopeo/skopeo-0.1.41.ebuild @@ -12,12 +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="" +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" @@ -26,7 +26,7 @@ RDEPEND="${COMMON_DEPEND}" RESTRICT="test" src_compile() { - local BUILDTAGS="containers_image_ostree_stub" + local BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)" set -- env -u GOCACHE -u XDG_CACHE_HOME \ go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \ -gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \ -- 2.26.0