diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
| commit | feb0daf81d888e9160f9f94502de09b66f2a63fd (patch) | |
| tree | b6e5c40ce2abef3da27ed50a023153f475e0ddef /app-emulation/skopeo | |
| parent | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff) | |
gentoo resync : 21.06.2020
Diffstat (limited to 'app-emulation/skopeo')
| -rw-r--r-- | app-emulation/skopeo/Manifest | 5 | ||||
| -rw-r--r-- | app-emulation/skopeo/skopeo-1.1.0.ebuild (renamed from app-emulation/skopeo/skopeo-0.1.40-r1.ebuild) | 26 |
2 files changed, 10 insertions, 21 deletions
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest index 90eabc7e3967..a1d75d7cf28d 100644 --- a/app-emulation/skopeo/Manifest +++ b/app-emulation/skopeo/Manifest @@ -1,8 +1,7 @@ -DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d -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.40-r1.ebuild 1734 BLAKE2B 3ad25540278b444c94b7bbdda5684f74118afef56989e439efb8451217248b1a3062945c1b5a6d40844162b2ccb8e8981405df250a25e7c8475c020214adc816 SHA512 b4b45ae2bda0f877828edc0cdf6befd900d9d232f7416eff57724163401ca04f95ebec6a13d7c0d54810a5a7f994794d69be78a1528a7f36c5032ee2996e29ed +DIST skopeo-1.1.0.tar.gz 4516471 BLAKE2B 665acc925cd4f0a97919bbc03db37ca9b5636d110e4780b5053c4a2773b4e524dd879870262f1760aee7413f52c7614cc4adcd56f20881cfe20b2c9a3af09dc3 SHA512 84ce9d786a471cf7d2551ae884801255b0fe501a21d3d2bbbfe0bb9e9c771105b00cdcfc1bef2cee5bd5ce55d0fd30be49c87c09361be47854dbb5e8e20e13a5 EBUILD skopeo-0.1.41.ebuild 1330 BLAKE2B d17e46533d449b957b0829d2bd7790610fa3f1f314500b9a830d2710eeef33c6b0c8125bd803125245b361aae351e241bd8754683d0d28a6f63746d2cabd58a6 SHA512 c907e07d0587e652f425ac91be2dd5648820622864fea7845558db2f6df1f3c21ccd029f24b9be8edccf3e51679290fde22526590dcd55558227909ae520878f EBUILD skopeo-0.2.0.ebuild 1396 BLAKE2B b36f33f7ab6c5fc8f963a16a505aa2e72cb5c74b2639eba02096e12a6d7b569ce64bac8c5f1072926ec8823532eeecd6c72567a910d4390c1639b07db358f78d SHA512 e77213f9d79443d813d434b2483ef5c685db5791eb1f5e56418754ffbe53ce76a6390964bfd1fe4fcf411a1fb037045ec86157d434adde6d593d2dcdbfde3cd6 +EBUILD skopeo-1.1.0.ebuild 1396 BLAKE2B e4729f5f1fe1685fa239d1b03ef5c36ba1eec93595d133443b477d1e896fea7bb6424f55503b5a47582712eaa1126a3ecaab8a8bcb8abf1d7d393b76a1e4485a SHA512 41c72d1bf3107bcaaecea043bf9005b65b992073bfdfbff04e9d9fb3eea3ea9c8b1e959d6c1fb647719eccd682c597bcc1dfc0eea3a1162bbada350547b660c5 MISC metadata.xml 342 BLAKE2B 8109faaacc76ba08392a58856a22d3b7384e1cef85100e10f6827bf567bf51e4127e2c938e70de572ceefc99e3a57c32a7a10df878ba5516b5777ff26e6aca2e SHA512 8b400ab3b9293a3697bd8695e321c40a0f4d7a56f13539408ad93e1b4ef513035502649725c4c1ac478db8670c6141569ee45351c9c28b4a68500aeae1a82790 diff --git a/app-emulation/skopeo/skopeo-0.1.40-r1.ebuild b/app-emulation/skopeo/skopeo-1.1.0.ebuild index c42103170fb0..80f88e4f1c14 100644 --- a/app-emulation/skopeo/skopeo-0.1.40-r1.ebuild +++ b/app-emulation/skopeo/skopeo-1.1.0.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -COMMIT=be6146b +COMMIT=63085f5bef1131aa9ec0907a5c8d66b67de7c4b2 inherit go-module bash-completion-r1 DESCRIPTION="Command line utility foroperations on container images and image repositories" HOMEPAGE="https://github.com/containers/skopeo" -CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch" -SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}" +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="" +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" @@ -27,18 +25,10 @@ RDEPEND="${COMMON_DEPEND}" RESTRICT="test" -src_prepare() { - default - sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \ - "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \ - "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die - eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" -} - src_compile() { - local BUILDTAGS="containers_image_ostree_stub" - set -- env -u GOCACHE -u XDG_CACHE_HOME \ - go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \ + 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 echo "$@" |