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 AC1BF138334 for ; Thu, 19 Sep 2019 03:02:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A14D1E092A; Thu, 19 Sep 2019 03:02:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7E147E092A for ; Thu, 19 Sep 2019 03:02:31 +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 08D9E34B353 for ; Thu, 19 Sep 2019 03:02:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51DD0785 for ; Thu, 19 Sep 2019 03:02:27 +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: <1568860568.7a7f7201c4e8200a6c470bab028a7cb7e972b536.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/containers-storage/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/containers-storage/Manifest app-emulation/containers-storage/containers-storage-1.12.16.ebuild X-VCS-Directories: app-emulation/containers-storage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7a7f7201c4e8200a6c470bab028a7cb7e972b536 X-VCS-Branch: master Date: Thu, 19 Sep 2019 03:02:27 +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: 3afe9d6f-ad12-4fb7-b605-f6663102256f X-Archives-Hash: 408e945b0c6e9a41df2811b43b13fa88 commit: 7a7f7201c4e8200a6c470bab028a7cb7e972b536 Author: Zac Medico gentoo org> AuthorDate: Thu Sep 19 02:36:08 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Sep 19 02:36:08 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7f7201 app-emulation/containers-storage: Remove old version 1.12.16 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Zac Medico gentoo.org> app-emulation/containers-storage/Manifest | 1 - .../containers-storage-1.12.16.ebuild | 110 --------------------- 2 files changed, 111 deletions(-) diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest index a11d4ce2e0c..701ffdbae01 100644 --- a/app-emulation/containers-storage/Manifest +++ b/app-emulation/containers-storage/Manifest @@ -1,3 +1,2 @@ -DIST containers-storage-1.12.16.tar.gz 5970004 BLAKE2B 0e9f473c9315acb22b94c9cd17072659afe2270e05d7c7c595d0563bd4d96420b3ecaaaeaf61ce4a10647e40c7177b7483aadf62ce40237dea10c23cb91bba62 SHA512 17a073bb338547c1e64065a1a0013e083565abeb6aa366989160c90dfb6bd6d306ea25fc938194b607b0cc74918b1ff40b12ea274b3df771e2d848b2bbab2b5c DIST containers-storage-1.13.1.tar.gz 5983556 BLAKE2B 1d0b6aba0464603fb26c45beecdb9b4afe6566dff4698da980ad6f9736a6d810ec41334f181d5709f78bab986e704c965b1967ed591348cd687d9cb92875321d SHA512 9fa686f44dda3d363f7c623abc9baa0911e26eb5e7dbb7bc60da259fe8d52411cb25fb98e2c8db10a5a80ebf04d07af8390acd48d26706f913900b19e58eac9f DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6 diff --git a/app-emulation/containers-storage/containers-storage-1.12.16.ebuild b/app-emulation/containers-storage/containers-storage-1.12.16.ebuild deleted file mode 100644 index a472e58367b..00000000000 --- a/app-emulation/containers-storage/containers-storage-1.12.16.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_VENDOR=( - "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6" -) - -inherit golang-vcs-snapshot - -KEYWORDS="~amd64" -DESCRIPTION="containers/storage library" -HOMEPAGE="https://github.com/containers/storage" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="btrfs +device-mapper ostree test" -EGO_PN="${HOMEPAGE#*//}" -EGIT_COMMIT="v${PV}" -SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" -RDEPEND=" - btrfs? ( sys-fs/btrfs-progs ) - device-mapper? ( sys-fs/lvm2:= ) - ostree? ( - dev-libs/glib:= - dev-util/ostree:= - )" -DEPEND="${RDEPEND} - dev-go/go-md2man - test? ( - sys-fs/btrfs-progs - sys-fs/lvm2 - sys-apps/util-linux - )" -RESTRICT="test? ( userpriv ) !test? ( test )" - -src_unpack() { - golang-vcs-snapshot_src_unpack -} - -src_prepare() { - default - - [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die - use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ - "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; } - - [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die - use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \ - "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; } - - [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die - use ostree || { echo -e "#!/bin/sh\ntrue" > \ - "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; } - - sed -e 's:TestChrootUntarPath(:_\0:' \ - -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die - sed -e 's:TestTarUntar(:_\0:' \ - -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \ - -e 's:TestTarWithOptions(:_\0:' \ - -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die - sed -e 's:TestTarUntarWithXattr(:_\0:' \ - -e 's:TestTarWithBlockCharFifo(:_\0:' \ - -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die - sed -e 's:TestTarUntarWithXattr(:_\0:' \ - -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die - sed -e 's:TestApplyLayer(:_\0:' \ - -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die - sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \ - -e 's:TestApplyLayerInvalidHardlink(:_\0:' \ - -e 's:TestApplyLayerInvalidSymlink(:_\0:' \ - -e 's:TestApplyLayerWhiteouts(:_\0:' \ - -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die - sed -e 's:TestCopyCaseE(:_\0:' \ - -e 's:TestCopyCaseEFSym(:_\0:' \ - -e 's:TestCopyCaseG(:_\0:' \ - -e 's:TestCopyCaseGFSym(:_\0:' \ - -e 's:TestCopyCaseH(:_\0:' \ - -e 's:TestCopyCaseHFSym(:_\0:' \ - -e 's:TestCopyCaseJ(:_\0:' \ - -e 's:TestCopyCaseJFSym(:_\0:' \ - -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die - sed -e 's:TestMount(:_\0:' \ - -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die -} - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME #678856 - mkdir -p "${S}/src/github.com/pquerna" || die - ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die - mkdir -p "${S}/bin" || die - cd "${S}/bin" || die - GOPATH="${S}" GOBIN="${S}/bin" \ - go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die - GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \ - emake -C "${S}/src/${EGO_PN}" containers-storage docs -} - -src_install() { - dobin "${S}/src/${EGO_PN}/${PN}" - while read -r -d ''; do - mv "${REPLY}" "${REPLY%.1}" || die - done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0) - find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die -} - -src_test() { - GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die -}