commit: 0adb0f5dda350c02f02bf7240f256e7edefc70c0 Author: Richard Yao <ryao <AT> gentoo <DOT> org> AuthorDate: Mon Apr 16 15:29:48 2018 +0000 Commit: Richard Yao <ryao <AT> gentoo <DOT> org> CommitDate: Mon Apr 16 15:41:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0adb0f5d
Fix package.use.mask for USE flags that pull in sys-fs/zfs 877947d414bf8b576b9d79226da82afa3df446a5 broke it. ab9e52ff6b08650f4661ec9f8b9cf131364a5b60 was a partial fix for x86 only. This should fix it properly for all architectures. Package-Manager: Portage-2.3.24, Repoman-2.3.6 Signed-off-by: Richard Yao <ryao <AT> gentoo.org> profiles/arch/amd64/package.use.mask | 5 +++++ profiles/arch/base/package.use.mask | 8 ++++++++ profiles/arch/x86/package.use.mask | 5 ----- profiles/base/package.use.stable.mask | 4 ++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 3992c3053e6..d41611604ae 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -17,6 +17,11 @@ #--- END OF EXAMPLES --- +# Richard Yao <r...@gentoo.org> (16 Apr 2018) +# sys-fs/zfs is keyworded on amd64 +sys-cluster/ceph -zfs +sys-boot/grub -libzfs + # Amy Liffey <amy...@gentoo.org> (19 Sep 2017) # [cuda] is unmasked in this profiles. media-libs/opencv -contrib_xfeatures2d diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 001f04631e2..6786118cca0 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Richard Yao <r...@gentoo.org> (16 Apr 2018) +# sys-fs/zfs is not available everywhere. +sys-cluster/ceph zfs + # Michał Górny <mgo...@gentoo.org> (30 Dec 2017) # Moved from use.mask since it is a flag local to one package: # Joseph Jezak <jos...@gentoo.org> (11 Mar 2007) @@ -156,6 +160,10 @@ net-libs/gnutls dane # fontconfig-infinality dependency not yet keyworded on most arches media-libs/freetype infinality +# Mike Gilbert <flop...@gentoo.org> (29 Jun 2012) +# sys-fs/zfs is not available everywhere. +sys-boot/grub libzfs + # Michał Górny <mgo...@gentoo.org> (11 Apr 2012) # JIT compilation in libzpaq generates code for x86/amd64. app-arch/zpaq jit diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index 66a141d336e..4ce7a76c9ba 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -3,11 +3,6 @@ # This file requires >=portage-2.1.1 -# Richard Yao <r...@gentoo.org> (16 Mar 2018) -# sys-fs/zfs is not keyworded stable. -sys-cluster/ceph zfs -sys-boot/grub libzfs - # Jan Ziak <0xe2.0x9a.0...@gmail.com> (14 Mar 2018) # Expose SVGA backend for x86 users app-emulation/fuse -backend-svga diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 9d0606481ee..77fe69bcefe 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -93,6 +93,10 @@ media-plugins/kipi-plugins mediawiki vkontakte # Requires testing version of media-libs/opencv media-libs/mlt opencv +# Matthias Maier <tam...@gentoo.org> (22 Jan 2017) +# sys-fs/zfs isn't going to be marked stable anytime soon +app-emulation/libvirt zfs + # Michael Palimaka <kensing...@gentoo.org (18 Jan 2017) # www-client/weboob is horribly outdated and not stable app-office/kmymoney weboob
