diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-02-13 17:06:42 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-02-13 17:06:42 +0000 |
commit | cbbc321e8433664d90c1cb2bf79d2bacd6373fc1 (patch) | |
tree | e3ec53c9e6a26c6aece6d322f889e7303d5b675f | |
parent | 2020-02-13 16:37:39 UTC (diff) | |
parent | app-emulation/containerd: disable btrfs default (diff) | |
download | gentoo-cbbc321e8433664d90c1cb2bf79d2bacd6373fc1.tar.gz gentoo-cbbc321e8433664d90c1cb2bf79d2bacd6373fc1.tar.bz2 gentoo-cbbc321e8433664d90c1cb2bf79d2bacd6373fc1.zip |
Merge updates from master
7 files changed, 12 insertions, 12 deletions
diff --git a/app-emulation/containerd/containerd-1.2.10.ebuild b/app-emulation/containerd/containerd-1.2.10.ebuild index 53b84c161278..5a1d397114b4 100644 --- a/app-emulation/containerd/containerd-1.2.10.ebuild +++ b/app-emulation/containerd/containerd-1.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/" LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor +btrfs +cri hardened +seccomp" +IUSE="apparmor btrfs +cri hardened +seccomp" DEPEND="btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )" diff --git a/app-emulation/containerd/containerd-1.2.12.ebuild b/app-emulation/containerd/containerd-1.2.12.ebuild index d2c5c94985c2..5e5bc5aef5e8 100644 --- a/app-emulation/containerd/containerd-1.2.12.ebuild +++ b/app-emulation/containerd/containerd-1.2.12.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/" LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor +btrfs +cri hardened +seccomp" +IUSE="apparmor btrfs +cri hardened +seccomp" DEPEND="btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )" diff --git a/app-emulation/containerd/containerd-1.2.6.ebuild b/app-emulation/containerd/containerd-1.2.6.ebuild index dcc5a7670301..48bf1f799cf1 100644 --- a/app-emulation/containerd/containerd-1.2.6.ebuild +++ b/app-emulation/containerd/containerd-1.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/" LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor +btrfs +cri hardened +seccomp" +IUSE="apparmor btrfs +cri hardened +seccomp" DEPEND="btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )" diff --git a/app-emulation/containerd/containerd-1.2.7.ebuild b/app-emulation/containerd/containerd-1.2.7.ebuild index c021436695f6..1cba833a7419 100644 --- a/app-emulation/containerd/containerd-1.2.7.ebuild +++ b/app-emulation/containerd/containerd-1.2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/" LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor +btrfs +cri hardened +seccomp" +IUSE="apparmor btrfs +cri hardened +seccomp" DEPEND="btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )" diff --git a/app-emulation/containerd/containerd-1.3.0.ebuild b/app-emulation/containerd/containerd-1.3.0.ebuild index 0c5e0f6bd86c..0c41a6c57dd0 100644 --- a/app-emulation/containerd/containerd-1.3.0.ebuild +++ b/app-emulation/containerd/containerd-1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/" LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor +btrfs +cri hardened +seccomp" +IUSE="apparmor btrfs +cri hardened +seccomp" DEPEND="btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )" diff --git a/app-emulation/containerd/containerd-1.3.1.ebuild b/app-emulation/containerd/containerd-1.3.1.ebuild index 17258ef6de6a..97f5996a48aa 100644 --- a/app-emulation/containerd/containerd-1.3.1.ebuild +++ b/app-emulation/containerd/containerd-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/" LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor +btrfs +cri hardened +seccomp" +IUSE="apparmor btrfs +cri hardened +seccomp" DEPEND="btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )" diff --git a/app-emulation/containerd/containerd-1.3.2.ebuild b/app-emulation/containerd/containerd-1.3.2.ebuild index cd2272c6294d..b280fe999e58 100644 --- a/app-emulation/containerd/containerd-1.3.2.ebuild +++ b/app-emulation/containerd/containerd-1.3.2.ebuild @@ -21,7 +21,7 @@ fi LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor +btrfs +cri hardened +seccomp" +IUSE="apparmor btrfs +cri hardened +seccomp" DEPEND="btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )" |