From fab849d1daed0ba7f2ac497d07985c3dbb692543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jun 2019 21:23:20 +0100 Subject: gentoo resync : 16.06.2019 --- app-emulation/containers-storage/Manifest | 4 +- .../containers-storage-1.12.10.ebuild | 110 +++++++++++++++++++++ .../containers-storage-1.12.8.ebuild | 110 --------------------- 3 files changed, 112 insertions(+), 112 deletions(-) create mode 100644 app-emulation/containers-storage/containers-storage-1.12.10.ebuild delete mode 100644 app-emulation/containers-storage/containers-storage-1.12.8.ebuild (limited to 'app-emulation/containers-storage') diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest index 64b0d73f3ff2..e36484da1b4c 100644 --- a/app-emulation/containers-storage/Manifest +++ b/app-emulation/containers-storage/Manifest @@ -1,6 +1,6 @@ -DIST containers-storage-1.12.8.tar.gz 1591018 BLAKE2B cbcc46e86d6c00badfa3e9d5988757fca969fb1b61f6cd0f81cf257c6feac6deefbdad8534fd99e52842efcfd5099ca0d7e27966b0eb16f699e6c1c06e90c683 SHA512 2badef5ccd7292c77ad5de70403c6d343c3a19a81c0e7c22539eb939b5a3ea59447176d5d3d99e34e9877a11b3608268f8951bc74378be99c074ba2a31f27fdb +DIST containers-storage-1.12.10.tar.gz 1593313 BLAKE2B 4b0c412304dc6b3aa79064a6071abfdd325cffd7405c50d57008f3139cfd9afd450a21773e4463650b63720210381e58e11b8c019efcf0297377821c3b76c276 SHA512 83b7e353efe89192e1c956742202395981849f68d53967df14a6952e36c458a2a2adaed4cf7d959e3b73114906deb5056591b8fc3aefbc83b85f9f5dd378f031 DIST containers-storage-1.12.9.tar.gz 1593286 BLAKE2B f53ef233e3d08dad84cda9154271254f9fe04e951643f20e8ab5bd37456e4eeb7083c1810656072c2b4bdeea0f6188871d4db566363c8363d2c2087ab9a4d3cb SHA512 0b5ad6cb52b4b74da7c574ec6841d74b92ef20f853e8d8fed83e0f9d529a7749692225e26ae4ab89fbd2a6202651c8a3a44a57bc1f42bcbb755fdba26e9cb3fd DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6 -EBUILD containers-storage-1.12.8.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d +EBUILD containers-storage-1.12.10.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d EBUILD containers-storage-1.12.9.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d MISC metadata.xml 691 BLAKE2B 512255d8e2d91d64a04fcd5da04fa6db20fbaf66c580491f001716a06c0ff81ff572491cb9b4274229f2312c7235abcbe8e32b6de9e2344b418015c253866f26 SHA512 eeb059ee40101e47a81d4ff871a55295c68891c9bb6a5a2f87d7855e3aea36648f2db77317f3660602d338d6f3f8cf1018cc61f2722fcd6cb78f7f32ac62989b diff --git a/app-emulation/containers-storage/containers-storage-1.12.10.ebuild b/app-emulation/containers-storage/containers-storage-1.12.10.ebuild new file mode 100644 index 000000000000..312d2cda060a --- /dev/null +++ b/app-emulation/containers-storage/containers-storage-1.12.10.ebuild @@ -0,0 +1,110 @@ +# 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 btrfs_noversion 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 +} diff --git a/app-emulation/containers-storage/containers-storage-1.12.8.ebuild b/app-emulation/containers-storage/containers-storage-1.12.8.ebuild deleted file mode 100644 index 312d2cda060a..000000000000 --- a/app-emulation/containers-storage/containers-storage-1.12.8.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 btrfs_noversion 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 -} -- cgit v1.2.3