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 4582E138334 for ; Thu, 19 Sep 2019 03:37:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BF5DE093A; Thu, 19 Sep 2019 03:37:21 +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 173B5E093A for ; Thu, 19 Sep 2019 03:37:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8567D34B3B4 for ; Thu, 19 Sep 2019 03:37:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81D7D615 for ; Thu, 19 Sep 2019 03:37:17 +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: <1568863651.46fb9aa6eab2a319a0e22f7cfa937102789ccb65.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libpod/Manifest app-emulation/libpod/libpod-1.3.2-r1.ebuild app-emulation/libpod/libpod-1.4.0.ebuild app-emulation/libpod/libpod-1.4.4.ebuild X-VCS-Directories: app-emulation/libpod/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 46fb9aa6eab2a319a0e22f7cfa937102789ccb65 X-VCS-Branch: master Date: Thu, 19 Sep 2019 03:37:17 +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: e646780c-d00c-4b5c-93ea-ef92cae1c948 X-Archives-Hash: edc09ce15dd5f6e32b963c9f39aefbb8 commit: 46fb9aa6eab2a319a0e22f7cfa937102789ccb65 Author: Zac Medico gentoo org> AuthorDate: Thu Sep 19 03:27:31 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Sep 19 03:27:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46fb9aa6 app-emulation/libpod: Remove old versions Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Zac Medico gentoo.org> app-emulation/libpod/Manifest | 3 - app-emulation/libpod/libpod-1.3.2-r1.ebuild | 139 ---------------------------- app-emulation/libpod/libpod-1.4.0.ebuild | 139 ---------------------------- app-emulation/libpod/libpod-1.4.4.ebuild | 139 ---------------------------- 4 files changed, 420 deletions(-) diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest index d2e1ff238eb..d81a0348f34 100644 --- a/app-emulation/libpod/Manifest +++ b/app-emulation/libpod/Manifest @@ -1,4 +1 @@ -DIST libpod-1.3.2.tar.gz 6901289 BLAKE2B 5de0cf9f47f7e10866839ba01f3c3ed930ebdb716ce10ca4cb6f6b4d0e96088e10a069726125f2dc4af6febe08e6b2fc058fb8e8ecd7dd870612ecb98f29bba5 SHA512 fb959bf6af314baf3d01c53b513390b6d181adca3f9ff2ca747fabd53abdd45907e8a3f8189ff2d1bd70cff8e8bad690407cf278392a0831e6109669a1c1b12b -DIST libpod-1.4.0.tar.gz 6937356 BLAKE2B d8fa4920485be89c84adca8a15946bfbac01671ff5460cb0e519cddd208e28b2dae392bfff93cf0b344d7d887e000d4edf430c81bd8a903678e10578a459cf70 SHA512 711de3cf02c96316aaec3d62fb5eaf5d16c6689b4b84cfcc3a375ba5c0554d3a7d2f789eb8d330e38be37d8907427641c077038c9945ed0ca6cd19ec872a451c -DIST libpod-1.4.4.tar.gz 8286321 BLAKE2B 2f7d529d1780694e450d7ac63aef53ad2bbe27a9cdd939fe7b7d5c71020173639a6b7c20e3732cb2a8320e0f55ec906acab29fc3b1bdbec8a05add1baf688194 SHA512 18e9f2cbd308d1fd5cd9d4931530b7c8357784a1cfd84ceb106813e5bfbd404424c656dd82d74c04678e8d83c03d2ef44c16d3a866b6844a3ed0adc0e88dd8b0 DIST libpod-1.5.1.tar.gz 8010274 BLAKE2B 4928b45a6d86fe14ff7359c856da664d14fc578dcff095c984eb0fa3b4aed42576cf610f19a9015064f406109d79cd6df60eb0b2990e5058de1e4f9f7d9ae7ee SHA512 d9d422c4189adb840cfe3dd8b7e8278412f0ea17e4ccd2cdf4f4b134a87b1add61bbdca1c8d9db3db846c272e2ab3f624bf9e4aac005b78d0c7e161af898dc02 diff --git a/app-emulation/libpod/libpod-1.3.2-r1.ebuild b/app-emulation/libpod/libpod-1.3.2-r1.ebuild deleted file mode 100644 index aa7383b1397..00000000000 --- a/app-emulation/libpod/libpod-1.3.2-r1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_COMMIT="14fdcd0dedaec2fa89ccb58840e297ecb98cc617" -EGO_PN="github.com/containers/${PN}" - -inherit golang-vcs-snapshot systemd - -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 - >=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() { - [[ -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 LDFLAGS -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="${D}${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 - - systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket - - 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 -} diff --git a/app-emulation/libpod/libpod-1.4.0.ebuild b/app-emulation/libpod/libpod-1.4.0.ebuild deleted file mode 100644 index 13e252945a3..00000000000 --- a/app-emulation/libpod/libpod-1.4.0.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_COMMIT="41365a8f6760349cac826a7c1d50ba2c4057ed50" -EGO_PN="github.com/containers/${PN}" - -inherit golang-vcs-snapshot systemd - -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 - >=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() { - [[ -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 LDFLAGS -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="${D}${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 - - systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket - - 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 -} diff --git a/app-emulation/libpod/libpod-1.4.4.ebuild b/app-emulation/libpod/libpod-1.4.4.ebuild deleted file mode 100644 index 8dfcea5cf94..00000000000 --- a/app-emulation/libpod/libpod-1.4.4.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_COMMIT="b3f10c8be229bcc58c1673b0431285fd5fce1293" -EGO_PN="github.com/containers/${PN}" - -inherit golang-vcs-snapshot systemd - -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 - >=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() { - [[ -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 LDFLAGS -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 - - systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket - - 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 -}