From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- app-emulation/runc/Manifest | 6 +-- app-emulation/runc/runc-1.0.0_rc10.ebuild | 18 ++------- app-emulation/runc/runc-1.0.0_rc8.ebuild | 63 ------------------------------- app-emulation/runc/runc-1.0.0_rc9.ebuild | 63 ------------------------------- 4 files changed, 5 insertions(+), 145 deletions(-) delete mode 100644 app-emulation/runc/runc-1.0.0_rc8.ebuild delete mode 100644 app-emulation/runc/runc-1.0.0_rc9.ebuild (limited to 'app-emulation/runc') diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest index bbeacae7616a..65cdd1649813 100644 --- a/app-emulation/runc/Manifest +++ b/app-emulation/runc/Manifest @@ -1,7 +1,3 @@ DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7 -DIST runc-1.0.0_rc8.tar.gz 1665924 BLAKE2B 542cbdefaaa1ef89d2abf8e31ca8116f26cddbfc3fb94dc8c7e94c51750b179ed557bee857ec80ede7280856c66c01c7961a26dc7e6202276baca46c691a3903 SHA512 f213b6a7fa96597d2ba1068f77752bccc0a1d62e0aac02ec8d2a2552dc3c1140fd4e52b2daeb0ac8fc09c48abe4521834450baae01ad4165308813eee7654a2b -DIST runc-1.0.0_rc9.tar.gz 1885161 BLAKE2B 638f00b857f43204cdc2b4e65927d6280e48b075d8363570e9da166ec35febaa749c733478d5c190c0119e0d95418e3295adcc129b68afbc5fec20ca3d9e9b59 SHA512 56c46fbe4d637a83d67e0aabf2549ba687d8b1e357fdecfffca343c8b166edf4158830aa0a4419edd6994c589b874bb8504eb3969ed3430cda6e233940d34194 -EBUILD runc-1.0.0_rc10.ebuild 1531 BLAKE2B 32ab0b4ef8a8d3e2106c3deca7f864c19346df7de0c766463cf6f3734ce15aabfab71acc70ce79f76949f00d59b504e0cace7ce2f1c16eb75f66a958bfcb953d SHA512 d0542749ebe44cf7bd7161341fc84055b3197bcf53acf4cea1b7765a2f7528d91d6f4b629c2e68f747c354d65224627a4b87c1f45d895813ca63976279d4f3cc -EBUILD runc-1.0.0_rc8.ebuild 1487 BLAKE2B 5a3ad59b6d6f8582f8f86d3f5887294bbacc9db973e0f3b0090a085dacb07b993a68a5f6da40824c99312534d033da03ec3e1e7230bf1d459f9025bbfd691d6d SHA512 41e23944c8bce42d7043d0fd4a6ea01096431c73d5636bd1f0b6a68452cb70aea7aa69d91588be7091d103a227375ca1dec3f4e10e96d8108f4591494cb6f816 -EBUILD runc-1.0.0_rc9.ebuild 1487 BLAKE2B 99a37b4281c595242104484419ff679963e590bb841f08ae84386e0fde31ae8e97c0ff95b879d8e8b0616e0b8a3ebb9ef9b4fb1dbaf2e93a09fc22cf411fa533 SHA512 af7591ad892b998ff8154b2d8329958fd82aed8897d673efb8e5ba131206e0ab9afb2e5ade0b51776fb8e0c2f6f110272f7718905d0ef2f63a54e4ab8d11deaa +EBUILD runc-1.0.0_rc10.ebuild 1362 BLAKE2B f2e7ee670bb5b5df2e3b136a767368da1d8ffcf0806e8c159317e057330aecdf272405c4ab0f0896fb340589f3f6d8b897aed28fb8c18634759d50cb7f794498 SHA512 15e280d30015e82707d6dab6786a1ba2ecca0cfa63623e1c017fb5cde969a53c51ad7b4c43e7eb0a81718a8dfa34e4eec3e1b16d0552cc4a4795d3ca9584a12f MISC metadata.xml 764 BLAKE2B a3132f8c72aaaac64caf15319068c94a3a849092ddf4d8ed83ef2b964ce714a12fc8f7c35ec85072fab02dbe5b650c23ba185372d7eb835d5a4bb30e1a88c784 SHA512 980f2d052132f8a72f218d6f0538fafac32e2af3b72e2aa4db0d3bd6ea120ec426ca16e5eeac721682a24200c5ea6f4d91f574926849d549fcff478872ff038b diff --git a/app-emulation/runc/runc-1.0.0_rc10.ebuild b/app-emulation/runc/runc-1.0.0_rc10.ebuild index 2338fa34630c..dc3d0ff8a266 100644 --- a/app-emulation/runc/runc-1.0.0_rc10.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc10.ebuild @@ -14,14 +14,14 @@ else # Change this when you update the ebuild RUNC_COMMIT=dc9208a3303feef5b3839f4323d9beb36df0a9dd SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64" inherit golang-build golang-vcs-snapshot fi DESCRIPTION="runc container cli tools" HOMEPAGE="http://runc.io" -LICENSE="Apache-2.0" +LICENSE="Apache-2.0 BSD-2 BSD MIT" SLOT="0" IUSE="+ambient apparmor hardened +kmem +seccomp" @@ -31,17 +31,6 @@ RDEPEND=" !app-emulation/docker-runc " -src_prepare() { - pushd src/${EGO_PN} - default - sed -i -e "/^GIT_BRANCH/d"\ - -e "/^GIT_BRANCH_CLEAN/d"\ - -e "/^COMMIT_NO/d"\ - -e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\ - Makefile || die - popd || die -} - src_compile() { # Taken from app-emulation/docker-1.7.0-r1 export CGO_CFLAGS="-I${ROOT}/usr/include" @@ -56,7 +45,8 @@ src_compile() { $(usex kmem '' 'nokmem') ) - GOPATH="${S}" emake BUILDTAGS="${options[*]}" -C src/${EGO_PN} + COMMIT=${RUNC_COMMIT} GOPATH="${S}" emake BUILDTAGS="${options[*]}" \ + -C src/${EGO_PN} } src_install() { diff --git a/app-emulation/runc/runc-1.0.0_rc8.ebuild b/app-emulation/runc/runc-1.0.0_rc8.ebuild deleted file mode 100644 index 2ceb623d765e..000000000000 --- a/app-emulation/runc/runc-1.0.0_rc8.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/opencontainers/${PN}" - -if [[ ${PV} == *9999 ]]; then - inherit golang-build golang-vcs -else - MY_PV="${PV/_/-}" - RUNC_COMMIT="425e105d5a03fabd737a126ad93d62a9eeede87f" # Change this when you update the ebuild - SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64" - inherit golang-build golang-vcs-snapshot -fi - -DESCRIPTION="runc container cli tools" -HOMEPAGE="http://runc.io" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+ambient apparmor hardened +kmem +seccomp" - -RDEPEND=" - apparmor? ( sys-libs/libapparmor ) - seccomp? ( sys-libs/libseccomp ) - !app-emulation/docker-runc -" - -src_prepare() { - pushd src/${EGO_PN} - default - sed -i -e "/^GIT_BRANCH/d"\ - -e "/^GIT_BRANCH_CLEAN/d"\ - -e "/^COMMIT_NO/d"\ - -e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\ - Makefile || die - popd || die -} - -src_compile() { - # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" - - # build up optional flags - local options=( - $(usex ambient 'ambient' '') - $(usex apparmor 'apparmor' '') - $(usex seccomp 'seccomp' '') - $(usex kmem '' 'nokmem') - ) - - GOPATH="${S}" emake BUILDTAGS="${options[*]}" -C src/${EGO_PN} -} - -src_install() { - pushd src/${EGO_PN} || die - dobin runc - dodoc README.md PRINCIPLES.md - popd || die -} diff --git a/app-emulation/runc/runc-1.0.0_rc9.ebuild b/app-emulation/runc/runc-1.0.0_rc9.ebuild deleted file mode 100644 index 8ee71c06ab27..000000000000 --- a/app-emulation/runc/runc-1.0.0_rc9.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/opencontainers/${PN}" - -if [[ ${PV} == *9999 ]]; then - inherit golang-build golang-vcs -else - MY_PV="${PV/_/-}" - RUNC_COMMIT="d736ef14f0288d6993a1845745d6756cfc9ddd5a" # Change this when you update the ebuild - SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64" - inherit golang-build golang-vcs-snapshot -fi - -DESCRIPTION="runc container cli tools" -HOMEPAGE="http://runc.io" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+ambient apparmor hardened +kmem +seccomp" - -RDEPEND=" - apparmor? ( sys-libs/libapparmor ) - seccomp? ( sys-libs/libseccomp ) - !app-emulation/docker-runc -" - -src_prepare() { - pushd src/${EGO_PN} - default - sed -i -e "/^GIT_BRANCH/d"\ - -e "/^GIT_BRANCH_CLEAN/d"\ - -e "/^COMMIT_NO/d"\ - -e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\ - Makefile || die - popd || die -} - -src_compile() { - # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" - - # build up optional flags - local options=( - $(usex ambient 'ambient' '') - $(usex apparmor 'apparmor' '') - $(usex seccomp 'seccomp' '') - $(usex kmem '' 'nokmem') - ) - - GOPATH="${S}" emake BUILDTAGS="${options[*]}" -C src/${EGO_PN} -} - -src_install() { - pushd src/${EGO_PN} || die - dobin runc - dodoc README.md PRINCIPLES.md - popd || die -} -- cgit v1.2.3