From 046403e71d0380221f615d2492f584f1e649b1ec Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 28 Jun 2022 16:12:34 +0530 Subject: [PATCH] app-editors/vim,vim-core: Add accept_keywords for vim & vim-core Signed-off-by: Sayan Chowdhury --- .../coreos-overlay/profiles/coreos/amd64/generic/package.use | 5 ++++- .../coreos-overlay/profiles/coreos/arm64/generic/package.use | 3 +++ .../profiles/coreos/base/package.accept_keywords | 4 ++-- .../profiles/coreos/targets/generic/make.defaults | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use index 9865e0391a..5beba2518d 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use @@ -5,5 +5,8 @@ sys-firmware/intel-microcode vanilla # Enable gssapi only for amd64, to avoid build errors in arm64. net-dns/bind-tools gssapi -# Disable crypt to avoid installing libsodlium in amd64. +# -crypt: Disable crypt to avoid installing libsodlium in amd64. app-editors/vim -crypt + +# minimal: Don't pull app-vim/gentoo-syntax in amd64 +app-editors/vim-core minimal diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/package.use index 3cad22ee54..82e4dbbe81 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/package.use @@ -1,2 +1,5 @@ # Disable crypt to avoid installing libsodlium in arm64. app-editors/vim -crypt + +# minimal: Don't pull app-vim/gentoo-syntax in arm64 +app-editors/vim-core minimal diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 5cf44cf941..17a2c0e6cf 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -49,8 +49,8 @@ =sys-apps/iproute2-5.15.0 ~amd64 ~arm64 # Required for some CVEs -=app-editors/vim-8.2.4328 ~amd64 ~arm64 -=app-editors/vim-core-8.2.4328 ~amd64 ~arm64 +=app-editors/vim-8.2.5066-r1 ~amd64 ~arm64 +=app-editors/vim-core-8.2.5066-r1 ~amd64 ~arm64 =sys-libs/zlib-1.2.12-r2 ~amd64 ~arm64 # Duktape is not yet stable diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index 0f2d4854f5..e8ff6e411f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -38,6 +38,7 @@ INSTALL_MASK="${INSTALL_MASK} /etc/sudoers /etc/wgetrc /etc/xinetd.d + /etc/vim/vimrc " # Remove selinuxenabled because it triggers breakage in Ansible