From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- app-emulation/runc/Manifest | 8 ++++---- app-emulation/runc/metadata.xml | 1 + app-emulation/runc/runc-1.0.0_rc10-r1.ebuild | 14 ++++++++------ app-emulation/runc/runc-1.0.0_rc92.ebuild | 16 +++++++++------- app-emulation/runc/runc-1.0.0_rc93.ebuild | 16 +++++++++------- 5 files changed, 31 insertions(+), 24 deletions(-) (limited to 'app-emulation/runc') diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest index 24d2b8c4171e..a26f039def69 100644 --- a/app-emulation/runc/Manifest +++ b/app-emulation/runc/Manifest @@ -1,7 +1,7 @@ DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7 DIST runc-1.0.0_rc92.tar.gz 2061469 BLAKE2B 06444eaf7602fe9ddaf7728c7f55bd718d1fe8f5f0ce6b21abc49a1d84eaa2fc3550d0d275ba5548ee9ebb6948a8ed415de8562a990d6085d1da8fb37e46afb9 SHA512 770a31736f5ab4ba359d91bd236750511f90b29af0af2bad5c238b611f465d7302e78b57ce8a702068440fda2d74588b92fd4d24c6d34e6fc1bd649ea3d8ee40 DIST runc-1.0.0_rc93.tar.gz 2132429 BLAKE2B 35d6fe9eebd26fb37d648a67b35415c51283ac3dff0f111e88be9120cf139e4811ab9a7b98e2c559dc4ce8b0e7958f15464dc4f039f7b3eb9f06f26a1776875f SHA512 087becdf3882818b7c8d05ac0192928695b35033d72e5ce584d5b8291310f4ba35b1cc78299fc8f17dc7ee425a94817b989890f4108444cc3c45927740b2d378 -EBUILD runc-1.0.0_rc10-r1.ebuild 1837 BLAKE2B ffc28565f2daf8dbda38f643dfb2bd26596531a19b3087a17a3f59a9c535080ac93c530c21055716a5d4c36211a62e3aecce74ed385a0446bb47784bd49e8420 SHA512 cdceb2bf1583bdb678da403a3e47bd4cdcdf1af081889ca36da0bdf606e93d477950e1e8e58d51d7d36d78a4a7f482bdc49e677f106f53e8d4326fbc2e56b820 -EBUILD runc-1.0.0_rc92.ebuild 1774 BLAKE2B 9af109cdb8709fe3208a61e6a302d25f2bfbb72d7bc43c5e5dea90fdada7413fa4df770b84b3e0efc16c059895415f1fc0efc55f8811efd4736ca2be3a739fa2 SHA512 9da62ddf994c4e6b0f7be658a80873f64fff8a35582b25c8809477ed437befaeb80dee11878450de36b379f0f9114d61c10b291b2c958aa0e29c59a41f1324b9 -EBUILD runc-1.0.0_rc93.ebuild 1712 BLAKE2B 042989a2156ed211ee4da27c27e9a429feec94e62fe14d7d5d651de2be7a1de037634c86d6b9f51ee936eb00c5d2165b29db364fa25299f00e997c9269019f68 SHA512 63e044ff01f9eb9491f6fc3e42b6b2b102fac1e2854ad41466d37e2bccf047af3246b00fb79f18e057dd874e6d638c890ece42677a28a7bd7cdc23632ce6c17d -MISC metadata.xml 876 BLAKE2B db5667a946ce043848f7cf87bcaa8c03594e9c4c35186fc905befd344202028742ab51a783751629086fc79cc3d6ee0d5b316978b2aa8677d6f47bd167fdca99 SHA512 0ad802b914d57523092f574450357bf90d54bce93d22e217061fce2817f68a43e5fd3402f80820c2b5e33ade763cb91ddb261250bfddf8ec4785e457981d69f0 +EBUILD runc-1.0.0_rc10-r1.ebuild 1877 BLAKE2B 770d1f1010886fd3d3bc5cef6e52dce7b73dd44971d34ab0b421b8ed1995182fd360b412257b2c28556ee6b7dea9bffcd05fafee1e0e06502580405276ca28c8 SHA512 68c40ecace94901438662468e4f6bb1c33f63ed7382e579e764cfe21241fb49b8bac335ec57eacabf95623fe1185fb6512e70678a98f9ced5a3f917cab4d4882 +EBUILD runc-1.0.0_rc92.ebuild 1815 BLAKE2B 7ff8d0c518fc735e3529ceefb5a963fe93025c403babaae144434c3662866c5ddaf60a3cf5b0e4b3cfc534a4c5dad5ab06d9c790c95667fd7e5705b1f9c169d2 SHA512 23324b45ab77036f4a6951951e6e5639c8465ad4b589d46ca49854c1f05fb586366b5b5d857bd00f5c9a5f46c09d14c7a1eea8fe0ab540bbd1ba681f7b0bbaf6 +EBUILD runc-1.0.0_rc93.ebuild 1764 BLAKE2B 3f9c71b441c120e4b10989c8d32a92ee9e3ebda927a4ee7bd553f78d05ddcfa225e1603bd6190640ac7ac40d0c75b7ed7c3b22fc599679888692f416d8f25c28 SHA512 56d5dfcfb84a0c2983d7401566e35b1d53222fa754081d575fcc0ebe49ce9458f094ec3de4eabb8f51ac297546d450622198320ad39c7d2c71480bf6e1a65aaf +MISC metadata.xml 940 BLAKE2B deaf72fbb5341bc95ab446cefeff9fdc870dfa87df4364132b862f7a699b5028f54a9d8852bf75bad0e229429cc6d22eb0c75f6bfa3ea4b1c4514cf5d0fcae3a SHA512 f24b8b3d59a534ff1991dfef51655c9e7a93f6c4f4cdb4a85d52ad69bdf17d68ee519d703a15941098cc90ce46643db48a0b398f8524cb80a9a7b2030ca20dc0 diff --git a/app-emulation/runc/metadata.xml b/app-emulation/runc/metadata.xml index 8b7ea39239c3..f9c14aa5bb8d 100644 --- a/app-emulation/runc/metadata.xml +++ b/app-emulation/runc/metadata.xml @@ -26,5 +26,6 @@ opencontainers/runc + cpe:/a:linuxfoundation:runc diff --git a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild index 9f60bd86db13..0a433baafd1e 100644 --- a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,9 +40,9 @@ RESTRICT+=" test" src_compile() { # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_CFLAGS="-I${ESYSROOT}/usr/include" export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" + -L${ESYSROOT}/usr/$(get_libdir)" # build up optional flags local options=( @@ -54,11 +54,8 @@ src_compile() { ) myemakeargs=( - BINDIR="${ED}/usr/bin" BUILDTAGS="${options[*]}" COMMIT=${RUNC_COMMIT} - DESTDIR="${ED}" - PREFIX="${ED}/usr" GOPATH="${S}" -C "src/${EGO_PN}" ) @@ -67,6 +64,11 @@ src_compile() { } src_install() { + myemakeargs+=( + PREFIX="${ED}/usr" + BINDIR="${ED}/usr/bin" + MANDIR="${ED}/usr/share/man" + ) emake "${myemakeargs[@]}" install install-man install-bash local DOCS=( src/"${EGO_PN}"/{README.md,PRINCIPLES.md,docs/.} ) diff --git a/app-emulation/runc/runc-1.0.0_rc92.ebuild b/app-emulation/runc/runc-1.0.0_rc92.ebuild index fe79682ba080..ec75ad824e47 100644 --- a/app-emulation/runc/runc-1.0.0_rc92.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc92.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P LICENSE="Apache-2.0 BSD-2 BSD MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" IUSE="apparmor +ambient hardened +kmem +seccomp selinux test" DEPEND="seccomp? ( sys-libs/libseccomp )" @@ -42,9 +42,9 @@ S="${WORKDIR}/${PN}-${MY_PV}" src_compile() { # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_CFLAGS="-I${ESYSROOT}/usr/include" export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" + -L${ESYSROOT}/usr/$(get_libdir)" # build up optional flags local options=( @@ -56,17 +56,19 @@ src_compile() { ) myemakeargs=( - BINDIR="${ED}/usr/bin" BUILDTAGS="${options[*]}" - COMMIT=${RUNC_COMMIT} - DESTDIR="${ED}" - PREFIX="${ED}/usr" + COMMIT="${RUNC_COMMIT}" ) emake "${myemakeargs[@]}" runc man } src_install() { + myemakeargs+=( + PREFIX="${ED}/usr" + BINDIR="${ED}/usr/bin" + MANDIR="${ED}/usr/share/man" + ) emake "${myemakeargs[@]}" install install-man install-bash local DOCS=( README.md PRINCIPLES.md docs/. ) diff --git a/app-emulation/runc/runc-1.0.0_rc93.ebuild b/app-emulation/runc/runc-1.0.0_rc93.ebuild index f89d4a1ce278..316f720fc29c 100644 --- a/app-emulation/runc/runc-1.0.0_rc93.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc93.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,9 +42,9 @@ S="${WORKDIR}/${PN}-${MY_PV}" src_compile() { # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_CFLAGS="-I${ESYSROOT}/usr/include" export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" + -L${ESYSROOT}/usr/$(get_libdir)" # build up optional flags local options=( @@ -54,17 +54,19 @@ src_compile() { ) myemakeargs=( - BINDIR="/usr/bin" BUILDTAGS="${options[*]}" - COMMIT=${RUNC_COMMIT} - DESTDIR="${ED}" - PREFIX="/usr" + COMMIT="${RUNC_COMMIT}" ) emake "${myemakeargs[@]}" runc man } src_install() { + myemakeargs+=( + PREFIX="${ED}/usr" + BINDIR="${ED}/usr/bin" + MANDIR="${ED}/usr/share/man" + ) emake "${myemakeargs[@]}" install install-man install-bash local DOCS=( README.md PRINCIPLES.md docs/. ) -- cgit v1.2.3