From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70379138334 for ; Tue, 26 Nov 2019 04:32:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2C84E08F5; Tue, 26 Nov 2019 04:32:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7912AE08F5 for ; Tue, 26 Nov 2019 04:32:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1468334D3BA for ; Tue, 26 Nov 2019 04:32:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67E898B0 for ; Tue, 26 Nov 2019 04:32:38 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1574742677.f615248b2b83d774324f22d3a4a9aa01af10426f.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/skopeo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/skopeo/Manifest app-emulation/skopeo/skopeo-0.1.40-r1.ebuild app-emulation/skopeo/skopeo-0.1.40.ebuild X-VCS-Directories: app-emulation/skopeo/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f615248b2b83d774324f22d3a4a9aa01af10426f X-VCS-Branch: master Date: Tue, 26 Nov 2019 04:32:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e6c333f7-b19b-441f-9073-b7a5694bb8fb X-Archives-Hash: 6a7ba39e15ae67211fdfab3111720f6d commit: f615248b2b83d774324f22d3a4a9aa01af10426f Author: Zac Medico gentoo org> AuthorDate: Tue Nov 26 04:31:17 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Nov 26 04:31:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f615248b app-emulation/skopeo: add upstream VFS user xattrs patch Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Zac Medico gentoo.org> app-emulation/skopeo/Manifest | 1 + .../skopeo/{skopeo-0.1.40.ebuild => skopeo-0.1.40-r1.ebuild} | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest index a2d4b48ca79..01fc9d0acf5 100644 --- a/app-emulation/skopeo/Manifest +++ b/app-emulation/skopeo/Manifest @@ -1,2 +1,3 @@ +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 diff --git a/app-emulation/skopeo/skopeo-0.1.40.ebuild b/app-emulation/skopeo/skopeo-0.1.40-r1.ebuild similarity index 75% rename from app-emulation/skopeo/skopeo-0.1.40.ebuild rename to app-emulation/skopeo/skopeo-0.1.40-r1.ebuild index 3ee26d3ab1a..c42103170fb 100644 --- a/app-emulation/skopeo/skopeo-0.1.40.ebuild +++ b/app-emulation/skopeo/skopeo-0.1.40-r1.ebuild @@ -7,7 +7,9 @@ inherit go-module 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" +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}" LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" @@ -25,6 +27,14 @@ 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 \