From b01a77041979e51e99c4e704981eeaa9ef67973c Mon Sep 17 00:00:00 2001
From: David Michael <dm0@redhat.com>
Date: Wed, 16 May 2018 17:04:11 -0400
Subject: [PATCH] dev-util/catalyst: Hack the stage1 script to upgrade ncurses

Add a patch to forcefully rebuild everything that depends on the
old ncurses slot.  This patch should be dropped as soon as the next
SDK is built and used in the manifest repo.
---
 ...yst-2.0.18-r4.ebuild => catalyst-2.0.18-r5.ebuild} |  1 +
 .../catalyst-2.0.18-coreos-upgrade-ncurses.patch      | 11 +++++++++++
 2 files changed, 12 insertions(+)
 rename sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/{catalyst-2.0.18-r4.ebuild => catalyst-2.0.18-r5.ebuild} (98%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild
similarity index 98%
rename from sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild
index 98e502b926..e75053b0ea 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}/catalyst-2.0.18-fix-quotes.patch"
 	"${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch"
 	"${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch"
+	"${FILESDIR}/catalyst-2.0.18-coreos-upgrade-ncurses.patch"
 )
 
 pkg_setup() {
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch
new file mode 100644
index 0000000000..a53604c5d8
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch
@@ -0,0 +1,11 @@
+--- targets/stage1/stage1-chroot.sh
++++ targets/stage1/stage1-chroot.sh
+@@ -30,6 +30,8 @@
+ 		if [ -n "${clst_update_seed_command}" ]; then
+ 			clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}"
+ 		else
++			clst_root_path=/ run_merge "--unmerge sys-libs/ncurses-5.9-r99"
++			clst_root_path=/ run_merge "<dev-lang/python-3 app-crypt/pinentry app-emulation/qemu app-editors/vim app-shells/bash app-shells/bash-completion dev-db/sqlite dev-lang/python dev-libs/libxml2 dev-util/cmake net-dns/bind-tools sys-apps/gptfdisk sys-apps/less sys-apps/util-linux sys-devel/gettext sys-fs/lvm2 sys-libs/ncurses"
+ 			clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc"
+ 		fi
+ 	elif [ "${clst_update_seed}" != "no" ]; then