From d8bad9c0f0f35324a6ce459eb7898addda423f90 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 17:47:26 -0800 Subject: [PATCH 01/21] profiles/coreos/base: merge package.keywords with package.accept_keywords --- .../coreos/base/package.accept_keywords | 13 +++++++++++++ .../profiles/coreos/base/package.keywords | 18 ------------------ 2 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.keywords 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 9c62fe6fa7..1d1f84285b 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 @@ -138,3 +138,16 @@ dev-util/checkbashisms # https://github.com/coreos/bugs/issues/923 =sys-fs/btrfs-progs-4.2.2 ~amd64 ~arm64 +# Get a newer version of pylint +=dev-python/astng-0.21.1 amd64 +=dev-python/pylint-0.23.0 amd64 +=dev-python/pyusb-0.4.3 amd64 + +=app-text/xmlto-0.0.24-r1 amd64 arm x86 +=dev-lang/nasm-2.09.10 amd64 x86 +=net-libs/libpcap-1.1.1-r1 amd64 arm x86 + +# Requires custom patches before unmasking +=dev-libs/nspr-4.9.2 -* ~arm ~x86 ~amd64 +=dev-libs/nss-3.14 -* ~arm ~x86 ~amd64 +=app-crypt/nss-3.14 -* ~arm ~x86 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.keywords deleted file mode 100644 index 833ca9f3b8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.keywords +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -#TODO: killme - -# Get a newer version of pylint -=dev-python/astng-0.21.1 amd64 -=dev-python/pylint-0.23.0 amd64 -=dev-python/pyusb-0.4.3 amd64 - -=app-text/xmlto-0.0.24-r1 amd64 arm x86 -=dev-lang/nasm-2.09.10 amd64 x86 -=net-libs/libpcap-1.1.1-r1 amd64 arm x86 - -# Requires custom patches before unmasking -=dev-libs/nspr-4.9.2 -* ~arm ~x86 ~amd64 -=dev-libs/nss-3.14 -* ~arm ~x86 ~amd64 -=app-crypt/nss-3.14 -* ~arm ~x86 ~amd64 From d65cdc5a740532712c0856d172b0d3f35d06c803 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 17:49:02 -0800 Subject: [PATCH 02/21] profiles/coreos/base/package.accept_keywords: remove old nss keywords --- .../profiles/coreos/base/package.accept_keywords | 9 --------- 1 file changed, 9 deletions(-) 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 1d1f84285b..b452303b43 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 @@ -2,11 +2,6 @@ # Copyright (c) 2013 The CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -# Requires custom patches before unmasking -=dev-libs/nspr-4.9.2 -* ~arm ~x86 ~amd64 -=dev-libs/nss-3.14 -* ~arm ~x86 ~amd64 -=app-crypt/nss-3.14 -* ~arm ~x86 ~amd64 - =dev-python/ws4py-0.2.4 ~amd64 =dev-embedded/smdk-dltool-0.20-r3 ~amd64 =dev-cpp/gflags-2.0 ~amd64 @@ -147,7 +142,3 @@ dev-util/checkbashisms =dev-lang/nasm-2.09.10 amd64 x86 =net-libs/libpcap-1.1.1-r1 amd64 arm x86 -# Requires custom patches before unmasking -=dev-libs/nspr-4.9.2 -* ~arm ~x86 ~amd64 -=dev-libs/nss-3.14 -* ~arm ~x86 ~amd64 -=app-crypt/nss-3.14 -* ~arm ~x86 ~amd64 From cc716a50836c0cce04e11b5c2749f2dd20f6a1b8 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 17:52:34 -0800 Subject: [PATCH 03/21] profiles/coreos/base/package.accept_keywords: remove unused dev-lang/closure-compiler-bin --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 b452303b43..4fa922ac5b 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 @@ -6,7 +6,6 @@ =dev-embedded/smdk-dltool-0.20-r3 ~amd64 =dev-cpp/gflags-2.0 ~amd64 =sys-devel/smatch-1.57-r1 ~amd64 -=dev-lang/closure-compiler-bin-20120305 ~amd64 =dev-util/shflags-1.0.3 ~amd64 =dev-util/perf-3.4 ~amd64 =sys-libs/libnih-1.0.3 ~amd64 From 17e20f6b46e03aa756d1609f5d8547a72d71a661 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 17:53:56 -0800 Subject: [PATCH 04/21] profiles/coreos/base/package.accept_keywords: remove keyword for missing dev-python/pyusb-1.0.0_alpha3 --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 4fa922ac5b..43fd9971b6 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 @@ -9,7 +9,6 @@ =dev-util/shflags-1.0.3 ~amd64 =dev-util/perf-3.4 ~amd64 =sys-libs/libnih-1.0.3 ~amd64 -=dev-python/pyusb-1.0.0_alpha3 ~amd64 # Get updated core code =sys-auth/pam_pwdfile-0.99-r1 ~amd64 From 78fbc64ab957c94b76b48247384d45746998469f Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 17:56:35 -0800 Subject: [PATCH 05/21] profiles/coreos/base/package.accept_keywords: remove keyword for missing sys-auth/pam_pwdfile --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 43fd9971b6..dcebb30ddd 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 @@ -11,7 +11,6 @@ =sys-libs/libnih-1.0.3 ~amd64 # Get updated core code -=sys-auth/pam_pwdfile-0.99-r1 ~amd64 =net-misc/tlsdate-0.0.5 ~amd64 =dev-libs/libgpg-error-1.10-r1 ~amd64 =net-misc/dhcp-4.2.2-r1 ~amd64 From 93955c4c20eba6a93f87641b3fea14cfbe1eaa56 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:00:54 -0800 Subject: [PATCH 06/21] profiles/coreos/base/package.accept_keywords: remove unused app-benchmarks/i7z-0.27-r1 --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 dcebb30ddd..e0a84ac063 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 @@ -14,7 +14,6 @@ =net-misc/tlsdate-0.0.5 ~amd64 =dev-libs/libgpg-error-1.10-r1 ~amd64 =net-misc/dhcp-4.2.2-r1 ~amd64 -=app-benchmarks/i7z-0.27-r1 ~amd64 =dev-libs/opencryptoki-2.4.2 ~amd64 # CRIU dependencies From 76996bbe44fa23cff77492cf8f5232238aa01fba Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:06:44 -0800 Subject: [PATCH 07/21] profiles/coreos/base/package.accept_keywords: remove unused dev-libs/opencryptoki-2.4.2 --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 e0a84ac063..e685658543 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 @@ -14,7 +14,6 @@ =net-misc/tlsdate-0.0.5 ~amd64 =dev-libs/libgpg-error-1.10-r1 ~amd64 =net-misc/dhcp-4.2.2-r1 ~amd64 -=dev-libs/opencryptoki-2.4.2 ~amd64 # CRIU dependencies =dev-libs/protobuf-c-0.15 ~amd64 From e417eb55004ef3aa6b2de87d66e54327a77dd0b0 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:07:32 -0800 Subject: [PATCH 08/21] profiles/coreos/base/package.accept_keywords: remove unused sys-process/criu dependency dev-libs/protobuf-c-0.15 --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 e685658543..7948773674 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 @@ -15,9 +15,6 @@ =dev-libs/libgpg-error-1.10-r1 ~amd64 =net-misc/dhcp-4.2.2-r1 ~amd64 -# CRIU dependencies -=dev-libs/protobuf-c-0.15 ~amd64 - # Everything needed for the boot engine >=sys-apps/kexec-tools-2.0.4-r1 ~amd64 sys-kernel/dracut ~amd64 From 29f7de4a7fd76cc0bb5d0bf684b8041c2f0b5071 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:10:59 -0800 Subject: [PATCH 09/21] profiles/coreos/base/package.accept_keywords: remove old dev-util/boost-build-1.52.0-r1 --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 7948773674..e967acd10d 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 @@ -39,9 +39,6 @@ net-misc/gsutil # Fixes euse: https://bugs.gentoo.org/show_bug.cgi?id=473760 =app-portage/gentoolkit-0.3.0.8 -# Docker dependencies are needed -=dev-util/boost-build-1.52.0-r1 ~amd64 - # Assorted bugfixes, avoids corrupting filesystems by updating UUID =sys-fs/e2fsprogs-1.42.9 ~amd64 ~sys-libs/e2fsprogs-libs-1.42.9 ~amd64 From 2c406af5f5a1ff4f6e2215e00199ec481598ddc1 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:11:36 -0800 Subject: [PATCH 10/21] profiles/coreos/base/package.accept_keywords: remove old e2fsprogs --- .../profiles/coreos/base/package.accept_keywords | 4 ---- 1 file changed, 4 deletions(-) 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 e967acd10d..69a14b1db4 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 @@ -39,10 +39,6 @@ net-misc/gsutil # Fixes euse: https://bugs.gentoo.org/show_bug.cgi?id=473760 =app-portage/gentoolkit-0.3.0.8 -# Assorted bugfixes, avoids corrupting filesystems by updating UUID -=sys-fs/e2fsprogs-1.42.9 ~amd64 -~sys-libs/e2fsprogs-libs-1.42.9 ~amd64 - # Really really hoping this fixes our compile issues =dev-lang/python-2.7.6 ~amd64 From 561f5092e42f8848f335de2300815082eda44381 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:12:06 -0800 Subject: [PATCH 11/21] profiles/coreos/base/package.accept_keywords: remove old dev-lang/python-2.7.6 --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 69a14b1db4..19f8e58d81 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 @@ -39,9 +39,6 @@ net-misc/gsutil # Fixes euse: https://bugs.gentoo.org/show_bug.cgi?id=473760 =app-portage/gentoolkit-0.3.0.8 -# Really really hoping this fixes our compile issues -=dev-lang/python-2.7.6 ~amd64 - # Kills an annoying warning =app-admin/eselect-1.4 From 22e0aa23dcf547e57eaa902f1a685a8376631765 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:12:37 -0800 Subject: [PATCH 12/21] profiles/coreos/base/package.accept_keywords: remove old app-admin/eselect-1.4 --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 19f8e58d81..ea028dd6a3 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 @@ -39,9 +39,6 @@ net-misc/gsutil # Fixes euse: https://bugs.gentoo.org/show_bug.cgi?id=473760 =app-portage/gentoolkit-0.3.0.8 -# Kills an annoying warning -=app-admin/eselect-1.4 - # no version marked stable upstream dev-util/checkbashisms From 0fcba1f1251eb7cb5c0bd31708628bb872fc39a5 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:13:01 -0800 Subject: [PATCH 13/21] profiles/coreos/base/package.accept_keywords: remove old net-analyzer/nmap-6.40-r1 --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 ea028dd6a3..a182888878 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 @@ -42,9 +42,6 @@ net-misc/gsutil # no version marked stable upstream dev-util/checkbashisms -# masked upstream due to lua dep, but we don't enable lua support -=net-analyzer/nmap-6.40-r1 - # this version does not segfault when a user isn't in sudoers =app-admin/sudo-1.8.10_p2 From 6f039d43d3f75bea6084d0f05e94d66a8544f00a Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:13:34 -0800 Subject: [PATCH 14/21] profiles/coreos/base/package.accept_keywords: remove old app-admin/sudo-1.8.10_p2 --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 a182888878..8720487e27 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 @@ -42,9 +42,6 @@ net-misc/gsutil # no version marked stable upstream dev-util/checkbashisms -# this version does not segfault when a user isn't in sudoers -=app-admin/sudo-1.8.10_p2 - # Current systemd git requires >= 3.10 to build, # use 3.13 since Gentoo is starting to stabilize that one: # https://bugs.gentoo.org/show_bug.cgi?id=507096 From c8bec3b94adc5a4ce4e8f35c9545566a2fc9c78c Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:14:20 -0800 Subject: [PATCH 15/21] profiles/coreos/base/package.accept_keywords: remove old sys-kernel/linux-headers-3.13 --- .../profiles/coreos/base/package.accept_keywords | 5 ----- 1 file changed, 5 deletions(-) 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 8720487e27..77f0d1008d 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 @@ -42,11 +42,6 @@ net-misc/gsutil # no version marked stable upstream dev-util/checkbashisms -# Current systemd git requires >= 3.10 to build, -# use 3.13 since Gentoo is starting to stabilize that one: -# https://bugs.gentoo.org/show_bug.cgi?id=507096 -=sys-kernel/linux-headers-3.13 - # 106 and 107 ebuilds improve systemd integration =sys-fs/lvm2-2.02.107 =sys-block/thin-provisioning-tools-0.3.2 From fd009b57d454566a9ca6e4a753496773f8cde296 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:15:39 -0800 Subject: [PATCH 16/21] profiles/coreos/base/package.accept_keywords: remove old sys-fs/lvm2-2.02.107 and sys-block/thin-provisioning-tools-0.3.2 --- .../profiles/coreos/base/package.accept_keywords | 4 ---- 1 file changed, 4 deletions(-) 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 77f0d1008d..8a749b7b91 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 @@ -42,10 +42,6 @@ net-misc/gsutil # no version marked stable upstream dev-util/checkbashisms -# 106 and 107 ebuilds improve systemd integration -=sys-fs/lvm2-2.02.107 -=sys-block/thin-provisioning-tools-0.3.2 - # current stable (4.3.x) xen-tools doesn't build without multilib ~app-emulation/xen-4.4.1 ~app-emulation/xen-tools-4.4.1 From d859738b893e69f699c00c8f6cf25572cd7ac61e Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:16:21 -0800 Subject: [PATCH 17/21] profiles/coreos/base/package.accept_keywords: remove old sys-fs/btrfs-progs-3.17.3 --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 8a749b7b91..751bd0fb11 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 @@ -50,9 +50,6 @@ dev-util/checkbashisms # Fixes a few bugs but has not yet been marked stable upstream. =app-arch/lbzip2-2.5 -# >=3.16 required by docker 1.4 -=sys-fs/btrfs-progs-3.17.3 - # Fixes findmnt with overlay and btrfs filesystems =sys-apps/util-linux-2.26.1 From 852d8eceb58c42a9c95055eeca51ca44e337cc92 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:16:40 -0800 Subject: [PATCH 18/21] profiles/coreos/base/package.accept_keywords: remove old net-misc/curl-7.41 --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 751bd0fb11..e81a2f4bf3 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 @@ -53,9 +53,6 @@ dev-util/checkbashisms # Fixes findmnt with overlay and btrfs filesystems =sys-apps/util-linux-2.26.1 -# fix for https://github.com/coreos/bugs/issues/324 -=net-misc/curl-7.41 - # link jq binary dynamically =app-misc/jq-1.4-r1 From 3cb04b16985cb171569f559c57dca635ed7cc72a Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:17:39 -0800 Subject: [PATCH 19/21] profiles/coreos/base/package.accept_keywords: remove old app-editors/vim-7.4.712 and app-editors/vim-core-7.4.712 --- .../profiles/coreos/base/package.accept_keywords | 5 ----- 1 file changed, 5 deletions(-) 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 e81a2f4bf3..0e3c661b80 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 @@ -62,11 +62,6 @@ dev-util/checkbashisms # Avoid cross compile error with amd64 stable (elfutils-0.158). =dev-libs/elfutils-0.161 ~amd64 -# Pickup upstream cross-compile fix -# https://bugs.gentoo.org/show_bug.cgi?id=473372 -=app-editors/vim-7.4.712 -=app-editors/vim-core-7.4.712 - # Provides useful new pages like loop(4) =sys-apps/man-pages-4.00 # Fixes conflict with man-pages 4.00 From f88fce89ace2c4837eb94643e3a8a2137fe934a3 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:21:08 -0800 Subject: [PATCH 20/21] profiles/coreos/base/package.accept_keywords: remove old app-text/xmlto-0.0.24-r1 --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 0e3c661b80..7127e564b5 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 @@ -91,7 +91,6 @@ dev-util/checkbashisms =dev-python/pylint-0.23.0 amd64 =dev-python/pyusb-0.4.3 amd64 -=app-text/xmlto-0.0.24-r1 amd64 arm x86 =dev-lang/nasm-2.09.10 amd64 x86 =net-libs/libpcap-1.1.1-r1 amd64 arm x86 From 85f175ded1cca6d03f574974e077f8f7c0220041 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 15 Dec 2015 18:21:27 -0800 Subject: [PATCH 21/21] profiles/coreos/base/package.accept_keywords: remove old net-libs/libpcap-1.1.1-r1 --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 7127e564b5..e30f5f3413 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 @@ -92,5 +92,4 @@ dev-util/checkbashisms =dev-python/pyusb-0.4.3 amd64 =dev-lang/nasm-2.09.10 amd64 x86 -=net-libs/libpcap-1.1.1-r1 amd64 arm x86