summaryrefslogtreecommitdiff
path: root/app-emulation/skopeo
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-05-14 11:09:11 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-05-14 11:09:11 +0100
commitdeba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree9a48f42594e1a9e6b2020d5535a784314434d7a7 /app-emulation/skopeo
parent38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
gentoo resync : 14.05.2020
Diffstat (limited to 'app-emulation/skopeo')
-rw-r--r--app-emulation/skopeo/Manifest6
-rw-r--r--app-emulation/skopeo/metadata.xml3
-rw-r--r--app-emulation/skopeo/skopeo-0.1.39.ebuild55
-rw-r--r--app-emulation/skopeo/skopeo-0.2.0.ebuild6
4 files changed, 9 insertions, 61 deletions
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index 8d76574636e5..90eabc7e3967 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -1,10 +1,8 @@
DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
-DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c
DIST skopeo-0.1.40.tar.gz 3907911 BLAKE2B 0a9ebcc9662036b1595149f0d19a46c0565b115d37b22c6410041eef3e6755b20561439596f1033dd6ce2c78a4948e358b2518003729873d5ab8ce9a7bec082c SHA512 161edb8afa961e48e314cf70a4fcebd971a45a50fc11eab6ec751ba4eb05a8be011d16b83c4ed1fa9d6336846da5f518da006d4476ee4e29a160c629820773d3
DIST skopeo-0.1.41.tar.gz 4692408 BLAKE2B d5e99be0cb478065f1478beda355abc11c8f13ad8446251048502da1b1af38d407ec46d284e59d2018af5d1ca6a953ad6156a306e9bc1acbdb22b447fe17a59f SHA512 924af178eb9621395cfffcf51aa072886dc8c20746bce1599a503df8c54794e34184a1fc6fd9582b889c7c8efecf8cf192797bc8e208b90c71cca31bb970d8e9
DIST skopeo-0.2.0.tar.gz 4295805 BLAKE2B 4ad13ff49bec56f3766e8d94f80fe8e22edb011b8862fb1249882e5695fa9260a6e2ce3d8345411ee7717cb92d4c1516268678f0884a62b02bfc8c9a554367ee SHA512 89d416110561dbe967860f752db607634a37b12adc376736de48264ec064abfed6b3db9ae195ffb3e9616dd6d65528660a23f2a5145d4674ed47cf443f17295a
-EBUILD skopeo-0.1.39.ebuild 1451 BLAKE2B 9652f26926ef19838041dbb50d355aaaddb975e4a8896fc35b90cfb145b75411f8964222d10229d8df1c9f2b80821746573e4485e5df79493b7bfb07025e519e SHA512 3f91ec57eac22a82c9a5a7e9eb755d0933476554ccf9a223a40b01452c3d57c5996a6e1b204f58ca7189c3260cec5a31971775778ddbbe32f8c920068c8bbe9d
EBUILD skopeo-0.1.40-r1.ebuild 1734 BLAKE2B 3ad25540278b444c94b7bbdda5684f74118afef56989e439efb8451217248b1a3062945c1b5a6d40844162b2ccb8e8981405df250a25e7c8475c020214adc816 SHA512 b4b45ae2bda0f877828edc0cdf6befd900d9d232f7416eff57724163401ca04f95ebec6a13d7c0d54810a5a7f994794d69be78a1528a7f36c5032ee2996e29ed
EBUILD skopeo-0.1.41.ebuild 1330 BLAKE2B d17e46533d449b957b0829d2bd7790610fa3f1f314500b9a830d2710eeef33c6b0c8125bd803125245b361aae351e241bd8754683d0d28a6f63746d2cabd58a6 SHA512 c907e07d0587e652f425ac91be2dd5648820622864fea7845558db2f6df1f3c21ccd029f24b9be8edccf3e51679290fde22526590dcd55558227909ae520878f
-EBUILD skopeo-0.2.0.ebuild 1318 BLAKE2B ca82dd7a456dde9cd8b354691d18123e7e66e163eadd04f9ecf2079f584b5b5a09dca5beb0a0ac905a94c0929da589474852606f2af380535918a5fa91b9fefe SHA512 4b73306b099f55d4216f4269a937c35755e7a1bd091dae00a8280803dc68c56ea34acbd722ce3a72b94823dbc36f0ade1844c6a96ba24be318c47762353efb6c
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+EBUILD skopeo-0.2.0.ebuild 1396 BLAKE2B b36f33f7ab6c5fc8f963a16a505aa2e72cb5c74b2639eba02096e12a6d7b569ce64bac8c5f1072926ec8823532eeecd6c72567a910d4390c1639b07db358f78d SHA512 e77213f9d79443d813d434b2483ef5c685db5791eb1f5e56418754ffbe53ce76a6390964bfd1fe4fcf411a1fb037045ec86157d434adde6d593d2dcdbfde3cd6
+MISC metadata.xml 342 BLAKE2B 8109faaacc76ba08392a58856a22d3b7384e1cef85100e10f6827bf567bf51e4127e2c938e70de572ceefc99e3a57c32a7a10df878ba5516b5777ff26e6aca2e SHA512 8b400ab3b9293a3697bd8695e321c40a0f4d7a56f13539408ad93e1b4ef513035502649725c4c1ac478db8670c6141569ee45351c9c28b4a68500aeae1a82790
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 @@
<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.1.39.ebuild b/app-emulation/skopeo/skopeo-0.1.39.ebuild
deleted file mode 100644
index b26bcce76158..000000000000
--- a/app-emulation/skopeo/skopeo-0.1.39.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/containers/skopeo
-COMMIT=1cf1e06
-inherit golang-vcs-snapshot bash-completion-r1
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/containers/skopeo"
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-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
- >=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-RESTRICT="test"
-
-src_compile() {
- local BUILDTAGS="containers_image_ostree_stub"
- set -- env -u GOCACHE -u XDG_CACHE_HOME GO111MODULE=on GOPATH="${WORKDIR}/${P}" \
- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
- -gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
- -o skopeo ./cmd/skopeo
- echo "$@"
- "$@" || die
- cd docs || die
- for f in *.1.md; do
- go-md2man -in ${f} -out ${f%%.md} || die
- done
-}
-
-src_install() {
- dobin skopeo
- doman docs/*.1
- dobashcomp completions/bash/skopeo
- insinto /etc/containers
- newins default-policy.json policy.json
- insinto /etc/containers/registries.d
- doins default.yaml
- keepdir /var/lib/atomic/sigstore
- einstalldocs
-}
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