diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-10 13:21:36 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-10 13:21:36 +0000 |
| commit | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch) | |
| tree | 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /app-emulation/libpod | |
| parent | bd4aeefe33e63f613512604e47bfca7b2187697d (diff) | |
gentoo resync : 10.11.2019
Diffstat (limited to 'app-emulation/libpod')
| -rw-r--r-- | app-emulation/libpod/Manifest | 4 | ||||
| -rw-r--r-- | app-emulation/libpod/libpod-1.6.3.ebuild (renamed from app-emulation/libpod/libpod-1.6.2.ebuild) | 25 |
2 files changed, 10 insertions, 19 deletions
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest index a901755e1e68..657b5fe226fb 100644 --- a/app-emulation/libpod/Manifest +++ b/app-emulation/libpod/Manifest @@ -1,7 +1,7 @@ AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45 DIST libpod-1.5.1.tar.gz 8010274 BLAKE2B 4928b45a6d86fe14ff7359c856da664d14fc578dcff095c984eb0fa3b4aed42576cf610f19a9015064f406109d79cd6df60eb0b2990e5058de1e4f9f7d9ae7ee SHA512 d9d422c4189adb840cfe3dd8b7e8278412f0ea17e4ccd2cdf4f4b134a87b1add61bbdca1c8d9db3db846c272e2ab3f624bf9e4aac005b78d0c7e161af898dc02 -DIST libpod-1.6.2.tar.gz 8270781 BLAKE2B 5d86533ddc821f731292e126102a31d651956c275a22c5c4ab3c57b9351832a1d85d75be877343c60af47716f9d1776315b3bf41fb17037d02fee10cf88efba3 SHA512 68192dda019623e3f3af9f82f946be8efbaf3e2c54acf23f62af67ac1ca093dd4dba11d2a7c1c950b99060393ed7e945752c1eaa9eada0dfc30f3dcaac8e1c04 +DIST libpod-1.6.3.tar.gz 8340471 BLAKE2B b017a29ab034d8432b3abe2d920e0a71ad6542a5f088ed0de8fc67e846b409efbfd5be2e72908b52b5d21f05ce30c31db3bd55f8d8974711eb8f48cf8c3553a5 SHA512 a4d9f4c74db42fade86c36f4b2c27b8b3ff42db90af21bccab2eae8e9d710ae102c05e1fa926ac1d8e67613e11fa40163800077b61e49d90de521ab472e9c8dd EBUILD libpod-1.5.1-r1.ebuild 3947 BLAKE2B b2e0acf87c7d929a85fea55eb4eb01029e6a62cf50c3e8009941d360bee2089c2ff24ae7e42ef29e6b6b47b907e8996e52b842d9d7b935a3b2046226e82a56e3 SHA512 709f350e30b2512c4d9eb22729b0a6b66b94e7411ecec8429ebbe96ce6d974fe984b9590b3ea113279f10af9d07b42a46f3713915d7a7bcd0d42f72e28af28aa -EBUILD libpod-1.6.2.ebuild 3947 BLAKE2B 00d279c3e2c57affac72db1cf22c9896fc6679713071c8b50157baf42158c7eb9a0b86a8ec1edf8c800450cb1582206acfc837d04b87380c0ebebd414071b2c3 SHA512 c88241f30dabb2a97d253980bf7c6776149d6d03aded2d63d2af1347ba40e78fceb510598c8633c76c26e8b7f75ecc66aba72916a39df906c2b45eeef3557ca2 +EBUILD libpod-1.6.3.ebuild 3642 BLAKE2B 842ab44923c9850213edb42c270ef015c42547e4b3863642651befef70d14a08d29da2e0017d354bdf858124887e10904d9b8238830aff9ca980f0d1cd577820 SHA512 facb44cd7f15957fa067e467630e0f8afa2a2a7f4fd79d3903061af3c8932d28289c7a0b7733674077371213bce26bdf611b63e9bd0d67dc8fcac6568f9d79c0 MISC metadata.xml 967 BLAKE2B 3fa19bf6148a1d6e7f2b73793d68a8cd22b612dc3f96356a967e01bd2cc9acf92b6aeebd4f299ab35841277a6ba3210a3014190672354c74d07733bf65fe262a SHA512 87c7701c60d07f8c3395dadf04ea52f5676d2f6cf845838ea300f2824203520f5b1229dd91da9ccd3c81c8cbbdddc320674e0075b4c1a7539cd863f7b8123555 diff --git a/app-emulation/libpod/libpod-1.6.2.ebuild b/app-emulation/libpod/libpod-1.6.3.ebuild index 9c1a41555c18..029c6c1413fc 100644 --- a/app-emulation/libpod/libpod-1.6.2.ebuild +++ b/app-emulation/libpod/libpod-1.6.3.ebuild @@ -3,10 +3,9 @@ EAPI=7 -EGIT_COMMIT="f3ffda1e08f19e9a6a88484136b5eed76533f21a" -EGO_PN="github.com/containers/${PN}" +EGIT_COMMIT="9d087f6a766259ba53b224944f1b7b778035c370" -inherit bash-completion-r1 flag-o-matic golang-vcs-snapshot +inherit bash-completion-r1 flag-o-matic go-module DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" HOMEPAGE="https://github.com/containers/libpod/" @@ -16,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="apparmor btrfs ostree +rootless selinux" -REQUIRED_USE="!selinux? ( !ostree )" +REQUIRED_USE="!ostree" RESTRICT="test" COMMON_DEPEND=" @@ -30,10 +29,6 @@ COMMON_DEPEND=" apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) - ostree? ( - dev-libs/glib:= - dev-util/ostree:= - ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) " @@ -41,7 +36,6 @@ DEPEND=" ${COMMON_DEPEND} dev-go/go-md2man" RDEPEND="${COMMON_DEPEND}" -S="${WORKDIR}/${P}/src/${EGO_PN}" src_prepare() { default @@ -52,6 +46,9 @@ src_prepare() { -e 's/$(GO) build/$(GO) build -v -work -x/' \ -e 's/^\(install:.*\) install\.python$/\1/' \ -i Makefile || die + + sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \ + -i hack/get_release_info.sh || die } src_compile() { @@ -73,13 +70,6 @@ src_compile() { hack/btrfs_installed_tag.sh || die fi - [[ -f hack/ostree_tag.sh ]] || die - if use ostree; then - echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die - else - echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die - fi - [[ -f hack/selinux_tag.sh ]] || die if use selinux; then echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die @@ -87,7 +77,8 @@ src_compile() { echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die fi - env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \ + export -n GOCACHE XDG_CACHE_HOME + GOBIN="${S}/bin" \ emake all \ GIT_BRANCH=master \ GIT_BRANCH_CLEAN=master \ |