| 1 |
commit: 0d5f0da4687b8f6544c28ad23c45795fa783b0de |
| 2 |
Author: Jonathan Callen <en.ABCD <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Apr 4 22:06:28 2020 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 2 14:07:20 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d5f0da4 |
| 7 |
|
| 8 |
app-emulation/skopeo: Make btrfs optional |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/716236 |
| 11 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/skopeo/metadata.xml | 3 +++ |
| 14 |
app-emulation/skopeo/skopeo-0.2.0.ebuild | 6 ++++-- |
| 15 |
2 files changed, 7 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/skopeo/metadata.xml b/app-emulation/skopeo/metadata.xml |
| 18 |
index c36c37139fa..6027ac0be07 100644 |
| 19 |
--- a/app-emulation/skopeo/metadata.xml |
| 20 |
+++ b/app-emulation/skopeo/metadata.xml |
| 21 |
@@ -5,4 +5,7 @@ |
| 22 |
<email>williamh@g.o</email> |
| 23 |
<name>William Hubbs</name> |
| 24 |
</maintainer> |
| 25 |
+ <use> |
| 26 |
+ <flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag> |
| 27 |
+ </use> |
| 28 |
</pkgmetadata> |
| 29 |
|
| 30 |
diff --git a/app-emulation/skopeo/skopeo-0.2.0.ebuild b/app-emulation/skopeo/skopeo-0.2.0.ebuild |
| 31 |
index 41797bfbd1b..c6caefe701f 100644 |
| 32 |
--- a/app-emulation/skopeo/skopeo-0.2.0.ebuild |
| 33 |
+++ b/app-emulation/skopeo/skopeo-0.2.0.ebuild |
| 34 |
@@ -12,11 +12,12 @@ SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g |
| 35 |
LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" |
| 36 |
SLOT="0" |
| 37 |
KEYWORDS="~amd64" |
| 38 |
+IUSE="btrfs" |
| 39 |
|
| 40 |
COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:= |
| 41 |
>=dev-libs/libassuan-2.4.3:= |
| 42 |
dev-libs/libgpg-error:= |
| 43 |
- >=sys-fs/btrfs-progs-4.0.1 |
| 44 |
+ btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) |
| 45 |
>=sys-fs/lvm2-2.02.145:=" |
| 46 |
DEPEND="${COMMON_DEPEND} |
| 47 |
dev-go/go-md2man" |
| 48 |
@@ -25,7 +26,8 @@ RDEPEND="${COMMON_DEPEND}" |
| 49 |
RESTRICT="test" |
| 50 |
|
| 51 |
src_compile() { |
| 52 |
- local BUILDTAGS="containers_image_ostree_stub" |
| 53 |
+ local BUILDTAGS |
| 54 |
+ BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)" |
| 55 |
set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \ |
| 56 |
-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \ |
| 57 |
-o skopeo ./cmd/skopeo |
Archives