From e3cf2c86fca1750343c1885311f857f185ee4f2d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 8 Sep 2019 01:07:24 +0100 Subject: gentoo resync : 08.09.2019 --- app-emulation/libpod/Manifest | 2 +- app-emulation/libpod/libpod-1.5.1-r1.ebuild | 142 ++++++++++++++++++++++++++++ app-emulation/libpod/libpod-1.5.1.ebuild | 140 --------------------------- 3 files changed, 143 insertions(+), 141 deletions(-) create mode 100644 app-emulation/libpod/libpod-1.5.1-r1.ebuild delete mode 100644 app-emulation/libpod/libpod-1.5.1.ebuild (limited to 'app-emulation/libpod') diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest index fc719675b800..36b97d8b0e5d 100644 --- a/app-emulation/libpod/Manifest +++ b/app-emulation/libpod/Manifest @@ -7,5 +7,5 @@ DIST libpod-1.5.1.tar.gz 8010274 BLAKE2B 4928b45a6d86fe14ff7359c856da664d14fc578 EBUILD libpod-1.3.2-r1.ebuild 3883 BLAKE2B 69659832d27cc862714e4f1e3c38f4ed17347849287c4d56a74ee13dbb0c76963d05792b583f250a5277d1e73bce69891568df2b1e355f28656faf8a4983868c SHA512 143e0f3590c2314574513f9884e4041381e9b246524e5b30ab9950eb05c297e91d8b22be21bde2c92ce3d98632baaaf0b86548931982bd62e7c911c9d70bdda6 EBUILD libpod-1.4.0.ebuild 3883 BLAKE2B d0dc897d5e3768c2b63e1f07dcc7d12856a505c780cc53ed404508cb1d73a5b8df09ad0c6a9a8e76210d6f25d20c4b3e57058648f43150804dea4b6d50d91d90 SHA512 57e50da85c7c455b81c0cf9d10d271628f924f2483cc1a51a54119622353a65fadb9d9348b004410d5050df8b243a112bcfed5cb75d095d876ad970babe188a6 EBUILD libpod-1.4.4.ebuild 3879 BLAKE2B 5b6d38fab756fc0d1728bde36e2fc32eafe780c68aae71915460a677399ad6dc15d8aadc0af0f2d7d64b1f925a433dbb4d22cc9ff5a8cfd4220da2c6c38ad553 SHA512 f22a57de1247161b34efd9e9c1897b538a43c49954afa591fec9aa184825dddbcebc7a948b33ccdd70a15fcdc0d6f0fd7ee49d01ab92f5993a252ca5cbbc51de -EBUILD libpod-1.5.1.ebuild 3857 BLAKE2B 8a9f5bb1e7d482a47aebd2d7a8a2b5c81d0eb7f14a7c8a6b2bf897476d6d6b39717b49d159a40540a2581b37fb76ba14e99c5b0394f2eb4eb45188284f939ed1 SHA512 ba9f7cdfb5e543385bd9bb48f1ea7728ccb6e95a29424ca85fb019f2040d9f0805cf75df7f5283f18fa14bb2dd63d096fb9a445055221b0a04ebe02430bacbf1 +EBUILD libpod-1.5.1-r1.ebuild 3908 BLAKE2B cbc1b96a85bad658281e1d5847073727c60ebdb95d6c774aa0d857c8f7a988e41b653c75df35fc7c21d665809850c91de068648f520112f635ee245e1287a0fa SHA512 9de63d09ada32a3a9e36049f6a587be0e0706b429438a784340ebe5326220c087ab74b712906c8545f98d195247f9b80c600f2cee77ccbfd13d505a0f33d6dc6 MISC metadata.xml 967 BLAKE2B 3fa19bf6148a1d6e7f2b73793d68a8cd22b612dc3f96356a967e01bd2cc9acf92b6aeebd4f299ab35841277a6ba3210a3014190672354c74d07733bf65fe262a SHA512 87c7701c60d07f8c3395dadf04ea52f5676d2f6cf845838ea300f2824203520f5b1229dd91da9ccd3c81c8cbbdddc320674e0075b4c1a7539cd863f7b8123555 diff --git a/app-emulation/libpod/libpod-1.5.1-r1.ebuild b/app-emulation/libpod/libpod-1.5.1-r1.ebuild new file mode 100644 index 000000000000..a3cd4c059627 --- /dev/null +++ b/app-emulation/libpod/libpod-1.5.1-r1.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_COMMIT="00057929f5acfd98341964d85722383363376d52" +EGO_PN="github.com/containers/${PN}" + +inherit bash-completion-r1 flag-o-matic golang-vcs-snapshot + +DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" +HOMEPAGE="https://github.com/containers/libpod/" +SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" + +KEYWORDS="~amd64" +IUSE="apparmor btrfs ostree +rootless selinux" +REQUIRED_USE="!selinux? ( !ostree )" +RESTRICT="test" + +COMMON_DEPEND=" + app-crypt/gpgme:= + >=app-emulation/conmon-2.0.0 + >=app-emulation/runc-1.0.0_rc6 + dev-libs/libassuan:= + dev-libs/libgpg-error:= + sys-fs/lvm2 + sys-libs/libseccomp:= + + apparmor? ( sys-libs/libapparmor ) + btrfs? ( sys-fs/btrfs-progs ) + ostree? ( + dev-libs/glib:= + dev-util/ostree:= + ) + rootless? ( app-emulation/slirp4netns ) + selinux? ( sys-libs/libselinux:= ) +" +DEPEND=" + ${COMMON_DEPEND} + dev-go/go-md2man" +RDEPEND="${COMMON_DEPEND}" +S="${WORKDIR}/${P}/src/${EGO_PN}" + +src_prepare() { + default + + # Disable installation of python modules here, since those are + # installed by separate ebuilds. + sed -e '/^GIT_.*/d' \ + -e 's/$(GO) build/$(GO) build -v -work -x/' \ + -e 's/^\(install:.*\) install\.python$/\1/' \ + -i Makefile || die +} + +src_compile() { + # Filter unsupported linker flags + filter-flags '-Wl,*' + + [[ -f hack/apparmor_tag.sh ]] || die + if use apparmor; then + echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die + else + echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die + fi + + [[ -f hack/btrfs_installed_tag.sh ]] || die + if use btrfs; then + echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die + else + echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ + 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 + else + 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" \ + emake all \ + GIT_BRANCH=master \ + GIT_BRANCH_CLEAN=master \ + COMMIT_NO="${EGIT_COMMIT}" \ + GIT_COMMIT="${EGIT_COMMIT}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + + insinto /etc/containers + newins test/registries.conf registries.conf.example + newins test/policy.json policy.json.example + + newinitd "${FILESDIR}"/podman.initd podman + + insinto /etc/logrotate.d + newins "${FILESDIR}/podman.logrotated" podman + + dobashcomp completions/bash/* + + keepdir /var/lib/containers +} + +pkg_preinst() { + LIBPOD_ROOTLESS_UPGRADE=false + if use rootless; then + has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true + fi +} + +pkg_postinst() { + local want_newline=false + if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then + elog "You need to create the following config files:" + elog "/etc/containers/registries.conf" + elog "/etc/containers/policy.json" + elog "To copy over default examples, use:" + elog "cp /etc/containers/registries.conf{.example,}" + elog "cp /etc/containers/policy.json{.example,}" + want_newline=true + fi + if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then + ${want_newline} && elog "" + elog "For rootless operation, you need to configure subuid/subgid" + elog "for user running podman. In case subuid/subgid has only been" + elog "configured for root, run:" + elog "usermod --add-subuids 1065536-1131071 " + elog "usermod --add-subgids 1065536-1131071 " + want_newline=true + fi +} diff --git a/app-emulation/libpod/libpod-1.5.1.ebuild b/app-emulation/libpod/libpod-1.5.1.ebuild deleted file mode 100644 index a51d046989d0..000000000000 --- a/app-emulation/libpod/libpod-1.5.1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_COMMIT="00057929f5acfd98341964d85722383363376d52" -EGO_PN="github.com/containers/${PN}" - -inherit flag-o-matic golang-vcs-snapshot - -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" -HOMEPAGE="https://github.com/containers/libpod/" -SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" - -KEYWORDS="~amd64" -IUSE="apparmor btrfs ostree +rootless selinux" -REQUIRED_USE="!selinux? ( !ostree )" -RESTRICT="test" - -COMMON_DEPEND=" - app-crypt/gpgme:= - >=app-emulation/conmon-2.0.0 - >=app-emulation/runc-1.0.0_rc6 - dev-libs/libassuan:= - dev-libs/libgpg-error:= - sys-fs/lvm2 - sys-libs/libseccomp:= - - apparmor? ( sys-libs/libapparmor ) - btrfs? ( sys-fs/btrfs-progs ) - ostree? ( - dev-libs/glib:= - dev-util/ostree:= - ) - rootless? ( app-emulation/slirp4netns ) - selinux? ( sys-libs/libselinux:= ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-go/go-md2man" -RDEPEND="${COMMON_DEPEND}" -S="${WORKDIR}/${P}/src/${EGO_PN}" - -src_prepare() { - default - - # Disable installation of python modules here, since those are - # installed by separate ebuilds. - sed -e '/^GIT_.*/d' \ - -e 's/$(GO) build/$(GO) build -v -work -x/' \ - -e 's/^\(install:.*\) install\.python$/\1/' \ - -i Makefile || die -} - -src_compile() { - # Filter unsupported linker flags - filter-flags '-Wl,*' - - [[ -f hack/apparmor_tag.sh ]] || die - if use apparmor; then - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die - else - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die - fi - - [[ -f hack/btrfs_installed_tag.sh ]] || die - if use btrfs; then - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die - else - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ - 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 - else - 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" \ - emake all \ - GIT_BRANCH=master \ - GIT_BRANCH_CLEAN=master \ - COMMIT_NO="${EGIT_COMMIT}" \ - GIT_COMMIT="${EGIT_COMMIT}" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - - insinto /etc/containers - newins test/registries.conf registries.conf.example - newins test/policy.json policy.json.example - - newinitd "${FILESDIR}"/podman.initd podman - - insinto /etc/logrotate.d - newins "${FILESDIR}/podman.logrotated" podman - - keepdir /var/lib/containers -} - -pkg_preinst() { - LIBPOD_ROOTLESS_UPGRADE=false - if use rootless; then - has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true - fi -} - -pkg_postinst() { - local want_newline=false - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then - elog "You need to create the following config files:" - elog "/etc/containers/registries.conf" - elog "/etc/containers/policy.json" - elog "To copy over default examples, use:" - elog "cp /etc/containers/registries.conf{.example,}" - elog "cp /etc/containers/policy.json{.example,}" - want_newline=true - fi - if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then - ${want_newline} && elog "" - elog "For rootless operation, you need to configure subuid/subgid" - elog "for user running podman. In case subuid/subgid has only been" - elog "configured for root, run:" - elog "usermod --add-subuids 1065536-1131071 " - elog "usermod --add-subgids 1065536-1131071 " - want_newline=true - fi -} -- cgit v1.2.3