public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/skopeo/
Date: Sat,  2 May 2020 14:08:57 +0000 (UTC)	[thread overview]
Message-ID: <1588428440.0d5f0da4687b8f6544c28ad23c45795fa783b0de.williamh@gentoo> (raw)

commit:     0d5f0da4687b8f6544c28ad23c45795fa783b0de
Author:     Jonathan Callen <en.ABCD <AT> gmail <DOT> com>
AuthorDate: Sat Apr  4 22:06:28 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> 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 <williamh <AT> 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 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<use>
+		<flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag>
+	</use>
 </pkgmetadata>

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


             reply	other threads:[~2020-05-02 14:09 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-02 14:08 William Hubbs [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-11-17  2:16 [gentoo-commits] repo/gentoo:master commit in: app-emulation/skopeo/ Sam James
2021-11-14  8:38 Sam James
2021-11-04 22:04 Zac Medico
2021-07-05 22:08 Zac Medico
2021-06-14 17:43 Zac Medico
2020-08-29 23:07 Zac Medico
2020-08-29 22:45 Sam James
2020-06-20  1:23 Aaron Bauman
2020-06-19  5:17 Zac Medico
2020-05-02 14:13 William Hubbs
2020-04-16 21:13 William Hubbs
2020-02-09  1:59 Zac Medico
2019-11-26  4:32 Zac Medico
2019-11-15 21:14 Zac Medico
2019-11-15 21:07 Zac Medico
2019-11-15 21:03 Zac Medico
2019-09-06 23:53 Zac Medico
2019-09-06 23:28 Zac Medico
2019-08-07  2:09 Zac Medico
2019-08-02 19:19 Zac Medico
2019-08-02 19:19 Zac Medico
2019-07-21  5:02 Zac Medico
2019-05-28 23:28 Zac Medico
2019-03-13 16:24 Zac Medico
2019-01-10 14:30 Manuel Rüger
2018-11-27 20:03 Zac Medico
2018-08-17  3:03 Zac Medico
2018-05-22  0:27 Zac Medico

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1588428440.0d5f0da4687b8f6544c28ad23c45795fa783b0de.williamh@gentoo \
    --to=williamh@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox